Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked in at 2014-06-26 10:42:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2014-06-02 07:00:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2014-06-26 10:42:36.000000000 +0200
@@ -1,0 +2,59 @@
+Wed Jun 25 11:52:17 UTC 2014 - ddiss@suse.com
+
+- Prevent file truncation on an open that fails with share mode violation;
+ (bso#10671); (bnc#884056).
+
+-------------------------------------------------------------------
+Mon Jun 23 09:43:53 UTC 2014 - lmuelle@suse.com
+
+- Update to 4.1.9.
+ + Fix nmbd denial of service; CVE-2014-0244; (bnc#880962).
+ + Fix segmentation fault in smbd_marshall_dir_entry()'s SMB_FIND_FILE_UNIX
+ handler; CVE-2014-3493; (bnc#883758).
+
+-------------------------------------------------------------------
+Thu Jun 12 18:09:44 UTC 2014 - lmuelle@suse.com
+
+- BuildRequire krb5-devel, libiniparser-devel, and python-devel in any case.
+
+-------------------------------------------------------------------
+Thu Jun 12 17:15:09 UTC 2014 - lmuelle@suse.com
+
+- BuildRequire libxslt and perl-ExtUtils-MakeMaker and BuildIgnore libtevent
+ on CentOS, Fedora, and RHEL systems.
+
+-------------------------------------------------------------------
+Tue Jun 3 18:36:06 UTC 2014 - lmuelle@suse.com
+
+- Update to 4.1.8.
+ + dns: Don't reply to replies; CVE-2014-0239; (bso#10609).
+ + Malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; CVE-2014-0178;
+ (bso#10549).
+
+ + s3: smb2: Fix 'xcopy /d' with samba shares; (bso#3124).
+ + Extra ':' in msg for Waf Cross Compile Build System with Cross-answers
+ command; (bso#10151).
+ + s3: nmbd: Reset debug settings after reading config file; (bso#10239).
+ + Fix empty body in if-statement in continue_domain_open_lookup; (bso#10348).
+ + script/autobuild: Make use of '--with-perl-{arch,lib}-install-dir';
+ (bso#10472).
+ + wafsamba: Fix the installation on FreeBSD; (bso#10472).
+ + Use exit_daemon() to communicate status of startup to systemd; (bso#10517).
+ + Fix adding NetApps; (bso#10524).
+ + s3: lib/util: Fix logic inside set_namearray loops; (bso#10544).
+ + s3: lib/util: set_namearray reads across end of namelist; (bso#10544).
+ + idmap_autorid: Fix failure in reverse lookup if ID is from domain range
+ index #0; (bso#10547).
+ + build: Fix ordering problems with lib-provided and internal RPATHs;
+ (bso#10548).
+ + Fix read of deleted memory in reply_writeclose()'; (bso#10554).
+ + lib-util: Rename memdup to smb_memdup and fix all callers; (bso#10556).
+ + Fix lock order violation and file lost; (bso#10564).
+ + dsdb: Do checks for invalid renames in samldb, before repl_meta_data;
+ (bso#10569).
+ + Fix wildcard unlink to fail if we get an error rather than trying to
+ continue; (bso#10577).
+ + byteorder: Do not assume PowerPC is big-endian; (bso#10590).
+ + printing: Fix purge of all print jobs; (bso#10612).
+
+-------------------------------------------------------------------
@@ -92 +151 @@
-- Fix "Invalid read" in method reply_writeclose; (bnc#873658).
+- Fix "Invalid read" in method reply_writeclose; (bso#10554); (bnc#873658).
Old:
----
samba-4.1.7.tar.asc
samba-4.1.7.tar.gz
New:
----
samba-4.1.9.tar.asc
samba-4.1.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba.spec ++++++
++++ 719 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/samba/samba.spec
++++ and /work/SRC/openSUSE:Factory/.samba.new/samba.spec
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/04e434661fa6b5f13776f925b0a7cbadb6b6d006 new/patches/samba.org/04e434661fa6b5f13776f925b0a7cbadb6b6d006
--- old/patches/samba.org/04e434661fa6b5f13776f925b0a7cbadb6b6d006 2014-04-16 20:18:30.000000000 +0200
+++ new/patches/samba.org/04e434661fa6b5f13776f925b0a7cbadb6b6d006 1970-01-01 01:00:00.000000000 +0100
@@ -1,91 +0,0 @@
-From 2c211f70aabf0a6896c5741fc1af92f73ddda0d8 Mon Sep 17 00:00:00 2001
-From: Noel Power
-Date: Thu, 27 Feb 2014 12:07:11 -0800
-Subject: [PATCH] s3: smbd - smb1 - fix read of deleted memory in
- reply_writeclose().
-
-While running smbtorture test raw.write under valgrind an "Invalid read"
-was reported in methid reply_writeclose, it seems after closing a file
-sometime later we try to access it again.
-
-Signed-off-by: Noel Power
-Signed-off-by: Jeremy Allison
-Reviewed-by: Andreas Schneider
-
-Autobuild-User(master): Jeremy Allison
-Autobuild-Date(master): Mon Mar 3 20:42:40 CET 2014 on sn-devel-104
-(cherry picked from commit 04e434661fa6b5f13776f925b0a7cbadb6b6d006)
----
- source3/smbd/reply.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git source3/smbd/reply.c source3/smbd/reply.c
-index 6b926fb..cbea49e 100644
---- source3/smbd/reply.c
-+++ source3/smbd/reply.c
-@@ -5194,7 +5194,7 @@ void reply_writeclose(struct smb_request *req)
- mtime = convert_time_t_to_timespec(srv_make_unix_date3(req->vwv+4));
- data = (const char *)req->buf + 1;
-
-- if (!fsp->print_file) {
-+ if (fsp->print_file == NULL) {
- init_strict_lock_struct(fsp, (uint64_t)req->smbpid,
- (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
- &lock);
-@@ -5208,6 +5208,10 @@ void reply_writeclose(struct smb_request *req)
-
- nwritten = write_file(req,fsp,data,startpos,numtowrite);
-
-+ if (fsp->print_file == NULL) {
-+ SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
-+ }
-+
- set_close_write_time(fsp, mtime);
-
- /*
-@@ -5215,34 +5219,32 @@ void reply_writeclose(struct smb_request *req)
- * JRA.
- */
-
-+ DEBUG(3,("writeclose %s num=%d wrote=%d (numopen=%d)\n",
-+ fsp_fnum_dbg(fsp), (int)numtowrite, (int)nwritten,
-+ (numtowrite) ? conn->num_files_open - 1 : conn->num_files_open));
-+
- if (numtowrite) {
- DEBUG(3,("reply_writeclose: zero length write doesn't close "
- "file %s\n", fsp_str_dbg(fsp)));
- close_status = close_file(req, fsp, NORMAL_CLOSE);
-+ fsp = NULL;
- }
-
-- DEBUG(3,("writeclose %s num=%d wrote=%d (numopen=%d)\n",
-- fsp_fnum_dbg(fsp), (int)numtowrite, (int)nwritten,
-- conn->num_files_open));
--
- if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
- reply_nterror(req, NT_STATUS_DISK_FULL);
-- goto strict_unlock;
-+ goto out;
- }
-
- if(!NT_STATUS_IS_OK(close_status)) {
- reply_nterror(req, close_status);
-- goto strict_unlock;
-+ goto out;
- }
-
- reply_outbuf(req, 1, 0);
-
- SSVAL(req->outbuf,smb_vwv0,nwritten);
-
--strict_unlock:
-- if (numtowrite && !fsp->print_file) {
-- SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
-- }
-+out:
-
- END_PROFILE(SMBwriteclose);
- return;
---
-1.8.1.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c new/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c
--- old/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c 2014-04-17 17:49:43.000000000 +0200
+++ new/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c 2014-06-25 13:47:13.000000000 +0200
@@ -84,7 +84,7 @@
index 1e0d06d..af1fa9b 100644
--- source3/smbd/proto.h
+++ source3/smbd/proto.h
-@@ -1103,8 +1103,8 @@ NTSTATUS check_user_share_access(connection_struct *conn,
+@@ -1100,8 +1100,8 @@ NTSTATUS check_user_share_access(connection_struct *conn,
bool change_to_user(connection_struct *conn, uint64_t vuid);
bool change_to_root_user(void);
bool smbd_change_to_root_user(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f new/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f
--- old/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f 2014-06-25 13:55:37.000000000 +0200
@@ -0,0 +1,45 @@
+From 906812aad2d1fec04076259f1d5332220b95221a Mon Sep 17 00:00:00 2001
+From: Volker Lendecke
+Date: Wed, 25 Jun 2014 08:36:47 +0000
+Subject: [PATCH 2/2] smbd: Remove 2 indentation levels
+
+Signed-off-by: Volker Lendecke
+Reviewed-by: David Disseldorp
+(cherry picked from commit 1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f)
+---
+ source3/smbd/open.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+Index: source3/smbd/open.c
+===================================================================
+--- source3/smbd/open.c.orig
++++ source3/smbd/open.c
+@@ -2651,17 +2651,17 @@ static NTSTATUS open_file_ntcreate(conne
+ }
+
+ /* Should we atomically (to the client at least) truncate ? */
+- if (!new_file_created) {
+- if (flags2 & O_TRUNC) {
+- if (!S_ISFIFO(fsp->fsp_name->st.st_ex_mode)) {
+- int ret = vfs_set_filelen(fsp, 0);
+- if (ret != 0) {
+- status = map_nt_error_from_unix(errno);
+- TALLOC_FREE(lck);
+- fd_close(fsp);
+- return status;
+- }
+- }
++ if ((!new_file_created) &&
++ (flags2 & O_TRUNC) &&
++ (!S_ISFIFO(fsp->fsp_name->st.st_ex_mode))) {
++ int ret;
++
++ ret = vfs_set_filelen(fsp, 0);
++ if (ret != 0) {
++ status = map_nt_error_from_unix(errno);
++ TALLOC_FREE(lck);
++ fd_close(fsp);
++ return status;
+ }
+ }
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/2eda479ffd5ae716a032fee44463ff94d6f18fcd new/patches/samba.org/2eda479ffd5ae716a032fee44463ff94d6f18fcd
--- old/patches/samba.org/2eda479ffd5ae716a032fee44463ff94d6f18fcd 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/2eda479ffd5ae716a032fee44463ff94d6f18fcd 2014-06-25 13:47:13.000000000 +0200
@@ -17,7 +17,7 @@
index ce3b0ec..bf64dbd 100644
--- source3/modules/vfs_default.c
+++ source3/modules/vfs_default.c
-@@ -1492,7 +1492,7 @@ static NTSTATUS vfswrap_copy_chunk_recv(struct vfs_handle_struct *handle,
+@@ -1501,7 +1501,7 @@ static NTSTATUS vfswrap_copy_chunk_recv(struct vfs_handle_struct *handle,
static NTSTATUS vfswrap_get_compression(struct vfs_handle_struct *handle,
TALLOC_CTX *mem_ctx,
struct files_struct *fsp,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/30e724cbff1ecd90e5a676831902d1e41ec1b347 new/patches/samba.org/30e724cbff1ecd90e5a676831902d1e41ec1b347
--- old/patches/samba.org/30e724cbff1ecd90e5a676831902d1e41ec1b347 2014-04-11 14:17:30.000000000 +0200
+++ new/patches/samba.org/30e724cbff1ecd90e5a676831902d1e41ec1b347 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-From 7aa75042a951d926042f6e15a826d2e1df7ce549 Mon Sep 17 00:00:00 2001
-From: Christof Schmitt
-Date: Mon, 5 Aug 2013 11:16:22 -0700
-Subject: [PATCH 1/2] FSCTL_GET_SHADOW_COPY_DATA: Initialize output array to
- zero
-
-Otherwise num_volumes and the end marker can return uninitialized data
-to the client.
-
-Signed-off-by: Christof Schmitt
-Reviewed-by: Jeremy Allison
-Reviewed-by: Simo Sorce
-
-(cherry picked from commit 30e724cbff1ecd90e5a676831902d1e41ec1b347)
----
- source3/modules/vfs_default.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git source3/modules/vfs_default.c source3/modules/vfs_default.c
-index 38b8b54..4c80f94 100644
---- source3/modules/vfs_default.c
-+++ source3/modules/vfs_default.c
-@@ -1158,7 +1158,7 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle,
- return NT_STATUS_BUFFER_TOO_SMALL;
- }
-
-- cur_pdata = talloc_array(ctx, char, *out_len);
-+ cur_pdata = talloc_zero_array(ctx, char, *out_len);
- if (cur_pdata == NULL) {
- TALLOC_FREE(shadow_data);
- return NT_STATUS_NO_MEMORY;
---
-1.8.4.5
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12 new/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12
--- old/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12 2014-06-25 13:55:24.000000000 +0200
@@ -0,0 +1,64 @@
+From d038b70b159fd133060ead0bed8d70b654594b03 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison
+Date: Tue, 24 Jun 2014 14:19:30 -0700
+Subject: [PATCH 1/2] s3: smbd - Prevent file truncation on an open that fails
+ with share mode violation.
+
+Fix from Volker, really - just tidied up a little.
+The S_ISFIFO check may not be strictly neccessary,
+but doesn't hurt (might make the code a bit more complex
+than it needs to be).
+
+Fixes bug #10671 - Samba file corruption as a result of failed lock check.
+
+https://bugzilla.samba.org/show_bug.cgi?id=10671
+
+Signed-off-by: Jeremy Allison
+Reviewed-by: Volker Lendecke
+Reviewed-by: David Disseldorp
+(cherry picked from commit 31b3427a417217e5e869baafdf63e633efc39d12)
+[ddiss@samba.org: 4.1 backport]
+---
+ source3/smbd/open.c | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+Index: source3/smbd/open.c
+===================================================================
+--- source3/smbd/open.c.orig
++++ source3/smbd/open.c
+@@ -840,8 +840,11 @@ static NTSTATUS open_file(files_struct *
+ }
+ }
+
+- /* Actually do the open */
+- status = fd_open_atomic(conn, fsp, local_flags,
++ /*
++ * Actually do the open - if O_TRUNC is needed handle it
++ * below under the share mode lock.
++ */
++ status = fd_open_atomic(conn, fsp, local_flags & ~O_TRUNC,
+ unx_mode, p_file_created);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(3,("Error opening file %s (%s) (local_flags=%d) "
+@@ -2647,6 +2650,21 @@ static NTSTATUS open_file_ntcreate(conne
+ return status;
+ }
+
++ /* Should we atomically (to the client at least) truncate ? */
++ if (!new_file_created) {
++ if (flags2 & O_TRUNC) {
++ if (!S_ISFIFO(fsp->fsp_name->st.st_ex_mode)) {
++ int ret = vfs_set_filelen(fsp, 0);
++ if (ret != 0) {
++ status = map_nt_error_from_unix(errno);
++ TALLOC_FREE(lck);
++ fd_close(fsp);
++ return status;
++ }
++ }
++ }
++ }
++
+ grant_fsp_oplock_type(fsp,
+ oplock_request,
+ got_level2_oplock,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/327b0ddcd9ea7db373a92e47db7e796da3186b05 new/patches/samba.org/327b0ddcd9ea7db373a92e47db7e796da3186b05
--- old/patches/samba.org/327b0ddcd9ea7db373a92e47db7e796da3186b05 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/327b0ddcd9ea7db373a92e47db7e796da3186b05 2014-06-25 13:47:13.000000000 +0200
@@ -16,7 +16,7 @@
index af1fa9b..9058efe 100644
--- source3/smbd/proto.h
+++ source3/smbd/proto.h
-@@ -1101,7 +1101,6 @@ NTSTATUS check_user_share_access(connection_struct *conn,
+@@ -1098,7 +1098,6 @@ NTSTATUS check_user_share_access(connection_struct *conn,
uint32_t *p_share_access,
bool *p_readonly_share);
bool change_to_user(connection_struct *conn, uint64_t vuid);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/3627ed732637a3b1bf992156306d6ffc14727b46 new/patches/samba.org/3627ed732637a3b1bf992156306d6ffc14727b46
--- old/patches/samba.org/3627ed732637a3b1bf992156306d6ffc14727b46 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/3627ed732637a3b1bf992156306d6ffc14727b46 2014-06-25 13:47:13.000000000 +0200
@@ -38,7 +38,7 @@
#include "lib/util/tevent_ntstatus.h"
struct btrfs_ioctl_clone_range_args {
-@@ -207,9 +212,119 @@ static NTSTATUS btrfs_copy_chunk_recv(struct vfs_handle_struct *handle,
+@@ -212,9 +217,119 @@ static NTSTATUS btrfs_copy_chunk_recv(struct vfs_handle_struct *handle,
return NT_STATUS_OK;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/423230f473020326ba6262784ed03268f4a894f8 new/patches/samba.org/423230f473020326ba6262784ed03268f4a894f8
--- old/patches/samba.org/423230f473020326ba6262784ed03268f4a894f8 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/423230f473020326ba6262784ed03268f4a894f8 2014-06-25 13:47:13.000000000 +0200
@@ -57,7 +57,7 @@
struct btrfs_ioctl_clone_range_args {
int64_t src_fd;
uint64_t src_offset;
-@@ -321,6 +335,7 @@ err_out:
+@@ -326,6 +340,7 @@ err_out:
static struct vfs_fn_pointers btrfs_fns = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f new/patches/samba.org/4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f
--- old/patches/samba.org/4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f 2014-04-17 17:49:43.000000000 +0200
+++ new/patches/samba.org/4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f 2014-06-25 13:47:13.000000000 +0200
@@ -168,7 +168,7 @@
index 6b926fb..b94bc45 100644
--- source3/smbd/reply.c
+++ source3/smbd/reply.c
-@@ -3387,7 +3387,7 @@ void reply_readbraw(struct smb_request *req)
+@@ -3388,7 +3388,7 @@ void reply_readbraw(struct smb_request *req)
return;
}
@@ -177,7 +177,7 @@
startpos = IVAL_TO_SMB_OFF_T(req->vwv+1, 0);
if(req->wct == 10) {
-@@ -4886,7 +4886,7 @@ void reply_lseek(struct smb_request *req)
+@@ -4887,7 +4887,7 @@ void reply_lseek(struct smb_request *req)
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/8bc4e6a9e0b09c744351e60f66c33c4d22dcfb6e new/patches/samba.org/8bc4e6a9e0b09c744351e60f66c33c4d22dcfb6e
--- old/patches/samba.org/8bc4e6a9e0b09c744351e60f66c33c4d22dcfb6e 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/8bc4e6a9e0b09c744351e60f66c33c4d22dcfb6e 2014-06-25 13:47:13.000000000 +0200
@@ -27,7 +27,7 @@
#include "../libcli/security/security.h"
#include "smbd/smbd.h"
#include "lib/param/loadparm.h"
-@@ -50,6 +51,9 @@ static void dos_mode_debug_print(uint32_t mode)
+@@ -55,6 +56,9 @@ static void dos_mode_debug_print(uint32_t mode)
if (mode & FILE_ATTRIBUTE_OFFLINE) {
DEBUG(8, ("[offline]"));
}
@@ -37,7 +37,7 @@
DEBUG(8,("\n"));
}
-@@ -646,6 +650,40 @@ static bool set_stat_dos_flags(connection_struct *conn,
+@@ -657,6 +661,40 @@ static bool set_stat_dos_flags(connection_struct *conn,
}
#endif /* HAVE_STAT_DOS_FLAGS */
@@ -78,7 +78,7 @@
/****************************************************************************
Change a unix mode to a dos mode.
May also read the create timespec into the stat struct in smb_fname
-@@ -695,6 +733,15 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
+@@ -706,6 +744,15 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
result |= FILE_ATTRIBUTE_OFFLINE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d new/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d
--- old/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d 2014-06-25 13:47:13.000000000 +0200
@@ -25,7 +25,7 @@
#include "passdb/lookup_sid.h"
#include "auth.h"
#include "serverid.h"
-@@ -4043,6 +4044,17 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
+@@ -4018,6 +4039,17 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a18e0e3aae7e69705cbf78a3bc73617eef630897 new/patches/samba.org/a18e0e3aae7e69705cbf78a3bc73617eef630897
--- old/patches/samba.org/a18e0e3aae7e69705cbf78a3bc73617eef630897 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/a18e0e3aae7e69705cbf78a3bc73617eef630897 2014-06-25 13:47:13.000000000 +0200
@@ -14,9 +14,9 @@
index 2d07dd9..93bc834 100644
--- source3/smbd/dosmode.c
+++ source3/smbd/dosmode.c
-@@ -25,6 +25,35 @@
- #include "smbd/smbd.h"
- #include "lib/param/loadparm.h"
+@@ -30,6 +30,35 @@
+ files_struct **ret_fsp,
+ bool *need_close);
+static void dos_mode_debug_print(uint32_t mode)
+{
@@ -50,7 +50,7 @@
static uint32_t filter_mode_by_protocol(uint32_t mode)
{
if (get_Protocol() <= PROTOCOL_LANMAN2) {
-@@ -679,19 +708,9 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
+@@ -690,19 +719,9 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
result = filter_mode_by_protocol(result);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/b24e42a70242757f83a60e723950bbaac148379a new/patches/samba.org/b24e42a70242757f83a60e723950bbaac148379a
--- old/patches/samba.org/b24e42a70242757f83a60e723950bbaac148379a 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/b24e42a70242757f83a60e723950bbaac148379a 2014-06-25 13:47:13.000000000 +0200
@@ -16,7 +16,7 @@
index 2c4162d..74ed070 100644
--- source3/modules/vfs_btrfs.c
+++ source3/modules/vfs_btrfs.c
-@@ -133,7 +133,7 @@ static struct tevent_req *btrfs_copy_chunk_send(struct vfs_handle_struct *handle
+@@ -138,7 +138,7 @@ static struct tevent_req *btrfs_copy_chunk_send(struct vfs_handle_struct *handle
cr_args.src_length = (uint64_t)num;
ret = ioctl(dest_fsp->fh->fd, BTRFS_IOC_CLONE_RANGE, &cr_args);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/d8d5d4c7428683da04fa4c8b344504e7044f9b1c new/patches/samba.org/d8d5d4c7428683da04fa4c8b344504e7044f9b1c
--- old/patches/samba.org/d8d5d4c7428683da04fa4c8b344504e7044f9b1c 2014-03-27 13:10:55.000000000 +0100
+++ new/patches/samba.org/d8d5d4c7428683da04fa4c8b344504e7044f9b1c 2014-06-25 13:47:13.000000000 +0200
@@ -196,7 +196,7 @@
index 82d059c..ce3b0ec 100644
--- source3/modules/vfs_default.c
+++ source3/modules/vfs_default.c
-@@ -1489,6 +1489,23 @@ static NTSTATUS vfswrap_copy_chunk_recv(struct vfs_handle_struct *handle,
+@@ -1498,6 +1498,23 @@ static NTSTATUS vfswrap_copy_chunk_recv(struct vfs_handle_struct *handle,
return NT_STATUS_OK;
}
@@ -220,7 +220,7 @@
/********************************************************************
Given a stat buffer return the allocated size on disk, taking into
account sparse files.
-@@ -2535,6 +2552,8 @@ static struct vfs_fn_pointers vfs_default_fns = {
+@@ -2544,6 +2561,8 @@ static struct vfs_fn_pointers vfs_default_fns = {
.fsctl_fn = vfswrap_fsctl,
.copy_chunk_send_fn = vfswrap_copy_chunk_send,
.copy_chunk_recv_fn = vfswrap_copy_chunk_recv,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696 new/patches/samba.org/eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696
--- old/patches/samba.org/eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696 2014-04-11 14:17:30.000000000 +0200
+++ new/patches/samba.org/eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-From 71e685e50d4f3a0663938a33e9a94354828057e1 Mon Sep 17 00:00:00 2001
-From: Christof Schmitt
-Date: Mon, 5 Aug 2013 11:21:59 -0700
-Subject: [PATCH 2/2] FSCTL_GET_SHADOW_COPY_DATA: Don't return 4 extra bytes at
- end
-
-labels_data_count already accounts for the unicode null character at the
-end of the array. There is no need in adding space for it again.
-
-Signed-off-by: Christof Schmitt
-Reviewed-by: Jeremy Allison
-Reviewed-by: Simo Sorce
-
-Autobuild-User(master): Jeremy Allison
-Autobuild-Date(master): Tue Aug 6 04:03:17 CEST 2013 on sn-devel-104
-
-(cherry picked from commit eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696)
----
- source3/modules/vfs_default.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git source3/modules/vfs_default.c source3/modules/vfs_default.c
-index 4c80f94..56430c8 100644
---- source3/modules/vfs_default.c
-+++ source3/modules/vfs_default.c
-@@ -1148,7 +1148,7 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle,
- if (!labels) {
- *out_len = 16;
- } else {
-- *out_len = 12 + labels_data_count + 4;
-+ *out_len = 12 + labels_data_count;
- }
-
- if (max_out_len < *out_len) {
-@@ -1175,7 +1175,7 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle,
- }
-
- /* needed_data_count 4 bytes */
-- SIVAL(cur_pdata, 8, labels_data_count + 4);
-+ SIVAL(cur_pdata, 8, labels_data_count);
-
- cur_pdata += 12;
-
---
-1.8.4.5
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67 new/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67
--- old/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67 2014-05-22 18:27:13.000000000 +0200
+++ new/patches/samba.org/efb4684a3fc0b32a71eab013000f730e6b144a67 1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-From efb4684a3fc0b32a71eab013000f730e6b144a67 Mon Sep 17 00:00:00 2001
-From: David Disseldorp
-Date: Wed, 21 May 2014 21:55:58 +0200
-Subject: [PATCH] printing: fix purge of all print jobs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The incorrect (system) jobid is currently passed to the job deletion
-function.
-
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=10612
-
-Reported-by: Franz Pförtsch
-Signed-off-by: David Disseldorp
-Reviewed-by: Jeremy Allison
----
- source3/printing/printing.c | 23 +++++++++++++++++++----
- 1 file changed, 19 insertions(+), 4 deletions(-)
-
-Index: source3/printing/printing.c
-===================================================================
---- source3/printing/printing.c.orig
-+++ source3/printing/printing.c
-@@ -3373,13 +3373,28 @@ WERROR print_queue_purge(const struct au
- if ( can_job_admin )
- become_root();
-
-- for (i=0;i
-Date: Mon, 5 May 2014 13:42:36 +0200
-Subject: [PATCH] byteorder: do not assume PowerPC is big-endian
-
-byteorder.h currently uses reverse-indexing ASM instructions for little
-endian multi-byte storage/retrieval on PowerPC. With Power8 this is an
-incorrect assumption, as it can be big or little endian.
-
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=10590
-
-Signed-off-by: David Disseldorp
-Reviewed-by: Christof Schmitt
----
- lib/util/byteorder.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git lib/util/byteorder.h lib/util/byteorder.h
-index 58cd68a..297be52 100644
---- lib/util/byteorder.h
-+++ lib/util/byteorder.h
-@@ -89,10 +89,12 @@ it also defines lots of intermediate macros, just ignore those :-)
-
-
- /*
-- on powerpc we can use the magic instructions to load/store
-- in little endian
--*/
--#if (defined(__powerpc__) && defined(__GNUC__))
-+ * On powerpc we can use the magic instructions to load/store in little endian.
-+ * The instructions are reverse-indexing, so assume a big endian Power
-+ * processor. Power8 can be big or little endian, so we need to explicitly
-+ * check.
-+ */
-+#if (defined(__powerpc__) && defined(__GNUC__) && HAVE_BIG_ENDIAN)
- static __inline__ uint16_t ld_le16(const uint16_t *addr)
- {
- uint16_t val;
---
-1.8.4.5
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/0008-vfs-add-snapshot-create-delete-hooks.patch new/patches/suse/0008-vfs-add-snapshot-create-delete-hooks.patch
--- old/patches/suse/0008-vfs-add-snapshot-create-delete-hooks.patch 2014-04-25 12:11:24.000000000 +0200
+++ new/patches/suse/0008-vfs-add-snapshot-create-delete-hooks.patch 2014-06-25 13:47:13.000000000 +0200
@@ -348,7 +348,7 @@
/* Directory operations */
static DIR *vfswrap_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
-@@ -2485,6 +2542,11 @@ static struct vfs_fn_pointers vfs_default_fns = {
+@@ -2494,6 +2551,11 @@ static struct vfs_fn_pointers vfs_default_fns = {
.statvfs_fn = vfswrap_statvfs,
.fs_capabilities_fn = vfswrap_fs_capabilities,
.get_dfs_referrals_fn = vfswrap_get_dfs_referrals,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/0009-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch new/patches/suse/0009-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch
--- old/patches/suse/0009-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch 2014-05-06 17:40:59.000000000 +0200
+++ new/patches/suse/0009-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch 2014-06-25 13:47:13.000000000 +0200
@@ -61,7 +61,7 @@
struct btrfs_cc_state {
struct vfs_handle_struct *handle;
-@@ -332,6 +356,366 @@ err_out:
+@@ -337,6 +361,366 @@ err_out:
return status;
}
@@ -428,7 +428,7 @@
static struct vfs_fn_pointers btrfs_fns = {
.fs_capabilities_fn = btrfs_fs_capabilities,
-@@ -339,6 +723,11 @@ static struct vfs_fn_pointers btrfs_fns = {
+@@ -344,6 +728,11 @@ static struct vfs_fn_pointers btrfs_fns = {
.copy_chunk_recv_fn = btrfs_copy_chunk_recv,
.get_compression_fn = btrfs_get_compression,
.set_compression_fn = btrfs_set_compression,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch new/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch
--- old/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch 2014-04-25 12:11:24.000000000 +0200
+++ new/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch 2014-06-25 13:47:13.000000000 +0200
@@ -2078,7 +2078,7 @@
#ifdef WITH_DFS
extern int dcelogin_atmost_once;
#endif /* WITH_DFS */
-@@ -1507,6 +1510,10 @@ extern void build_options(bool screen);
+@@ -1505,6 +1508,10 @@ extern void build_options(bool screen);
start_lsasd(ev_ctx, msg_ctx);
}
++++++ samba-4.1.7.tar.gz -> samba-4.1.9.tar.gz ++++++
/work/SRC/openSUSE:Factory/samba/samba-4.1.7.tar.gz /work/SRC/openSUSE:Factory/.samba.new/samba-4.1.9.tar.gz differ: char 5, line 1
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2014-05-23 12:52:25.000000000 +0200
+++ new/vendor-files/tools/package-data 2014-06-25 13:58:54.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="3243"
+SAMBA_PACKAGE_SVN_VERSION="3258"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org