[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via ed22de6 check_parent_exists() can change errno. Ensure we preserve it across calls. via a752308 Fix bug #9822 - Samba crashing during Win8 sync. via e83dc71 Remove dependency on detection of HAVE_DIRFD for use of fdopendir(). via 93d866e Remove the Ugly hack that was the second use of dirfd(). via 44d4728 In the struct smb_Dir destructor, use the fsp back pointer to release resources. via ecdcb62 Maintain a back-pointer to the fsp in struct smb_Dir when opening with FDOPENDIR. via 2a09b5d winbind4: Fix bug 9832 -- talloc use after free via 973bbc4 auth/ntlmssp: Avoid use-after-free of user_info after logon failure at log level 5 from ae3aa28 BUG 9817: Fix 'map untrusted to domain' with NTLMv2. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit ed22de6479971421b8e32188bfea4521a5f1c0cc Author: Anand Avati av...@redhat.com Date: Mon Apr 29 15:21:00 2013 -0700 check_parent_exists() can change errno. Ensure we preserve it across calls. Reviewed-by: Jeremy Allison j...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue Apr 30 11:00:11 CEST 2013 on sn-devel-104 (cherry picked from commit 7e807934e6550308efed814a20ce6d6dabbad557) Fix bug #9833 - Function called in unix_convert() path can overwrite errno. Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Tue May 7 10:32:43 CEST 2013 on sn-devel-104 commit a752308b89677d571300487858ba2509fe37ee6d Author: Jeremy Allison j...@samba.org Date: Fri Apr 26 10:47:41 2013 -0700 Fix bug #9822 - Samba crashing during Win8 sync. When refactoring the dptr desctructor in the fix for bug: 9778 (Samba directory code uses dirfd() without vectoring through a VFS call) I removed the code to NULL out the struct smb_Dir * pointer inside the fsp struct by mistake. Re-add the NULLing out of that pointer when closing a directory pointer associated with an open file. Reporter confirms it fixes the crash. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: David Disseldorp dd...@samba.org Autobuild-User(master): David Disseldorp dd...@samba.org Autobuild-Date(master): Sat Apr 27 20:44:55 CEST 2013 on sn-devel-104 (cherry picked from commit 251767cde9a146d8122d76e257ab232c05ad452a) commit e83dc714d5f773d8c9c08aa9bedc3f31cea7a137 Author: Jeremy Allison j...@samba.org Date: Wed Apr 10 16:30:10 2013 -0700 Remove dependency on detection of HAVE_DIRFD for use of fdopendir(). Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Andreas Schneider a...@samba.org Autobuild-User(master): Andreas Schneider a...@cryptomilk.org Autobuild-Date(master): Fri Apr 12 16:21:10 CEST 2013 on sn-devel-104 (cherry picked from commit 7a4dd845958f1411daa8031ca242987001ab2f26) commit 93d866e0dc5b968b442b24d7f00e304b4056a928 Author: Jeremy Allison j...@samba.org Date: Wed Apr 10 16:29:03 2013 -0700 Remove the Ugly hack that was the second use of dirfd(). The destructor does all the resource deallocation needed. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Andreas Schneider a...@samba.org (cherry picked from commit 0fe894fb89f4867e266bb04670a58101311e0234) commit 44d47283133f1564b736540dc724473d2bd08416 Author: Jeremy Allison j...@samba.org Date: Wed Apr 10 16:24:15 2013 -0700 In the struct smb_Dir destructor, use the fsp back pointer to release resources. Removes one use of dirfd(). Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Andreas Schneider a...@samba.org (cherry picked from commit ea14c9443178da9ae6ccbe71e573156396f6f699) commit ecdcb622bfaf636f87d13064dcf6c6fade880260 Author: Jeremy Allison j...@samba.org Date: Wed Apr 10 16:21:39 2013 -0700 Maintain a back-pointer to the fsp in struct smb_Dir when opening with FDOPENDIR. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Andreas Schneider a...@samba.org (cherry picked from commit e89ec641fc98ffd7f7193deb3728b0a284a093eb) commit 2a09b5d2cd04840a733cf06c95bea6f0f7377a45 Author: Volker Lendecke v...@samba.org Date: Mon Apr 29 18:40:08 2013 +0200 winbind4: Fix bug 9832 -- talloc use after free Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org (cherry picked from commit c672ef11b1ed663b6366f321d3628acf05b3d0fe) commit 973bbc449837f4c2ce07bc0403267fed83f340a9 Author: Andrew Bartlett abart...@samba.org Date: Fri Mar 15 13:00:55 2013 +1100 auth/ntlmssp: Avoid use-after-free of user_info after logon failure at log level 5
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8c1283a winbind: Fix bug 9854 -- NULL pointer dereference from 8ca4b75 Fix up the man pages to explain that store dos attributes overrides them. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8c1283a89f746a108e8014b6fbc9a58a371950cf Author: Volker Lendecke v...@samba.org Date: Tue May 7 12:39:16 2013 +0200 winbind: Fix bug 9854 -- NULL pointer dereference Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Tue May 7 14:49:07 CEST 2013 on sn-devel-104 --- Summary of changes: source3/winbindd/winbindd_cache.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 86f15c2..7252927 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -944,7 +944,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain, if (!centry) return; - if (domain_name[0] == '\0') { + if ((domain_name == NULL) || (domain_name[0] == '\0')) { struct winbindd_domain *mydomain = find_domain_from_sid_noinit(sid); if (mydomain != NULL) { @@ -972,7 +972,7 @@ static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS sta if (!centry) return; - if (domain_name[0] == '\0') { + if ((domain_name == NULL) || (domain_name[0] == '\0')) { struct winbindd_domain *mydomain = find_domain_from_sid_noinit(sid); if (mydomain != NULL) { @@ -1810,7 +1810,7 @@ NTSTATUS wcache_name_to_sid(struct winbindd_domain *domain, return NT_STATUS_NO_MEMORY; } - if (domain_name[0] == '\0') { + if ((domain_name == NULL) || (domain_name[0] == '\0')) { domain_name = domain-name; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 637887c Makefile: Fix bug 9868 - Don't know how to make LIBNDR_PREG_OBJ. from 8c1283a winbind: Fix bug 9854 -- NULL pointer dereference http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 637887c0795241872974c09838829b49d5994b10 Author: Volker Lendecke v...@samba.org Date: Tue May 7 15:07:34 2013 +0200 Makefile: Fix bug 9868 - Don't know how to make LIBNDR_PREG_OBJ. Thanks to Lucs for finding the issue Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Günther Deschner g...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue May 7 17:57:57 CEST 2013 on sn-devel-104 --- Summary of changes: source3/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index c701fd1..f4977ca 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -340,7 +340,7 @@ LIBNDR_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss.o \ ../librpc/ndr/ndr_spoolss_buf.o LIBNDR_NTPRINTING_OBJ = autoconf/librpc/gen_ndr/ndr_ntprinting.o \ - ../librpc/ndr/ndr_ntprinting.o \ + ../librpc/ndr/ndr_ntprinting.o LIBNDR_PREG_OBJ = autoconf/librpc/gen_ndr/ndr_preg.o \ ../librpc/ndr/ndr_preg.o -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 76bffc2 Tests processing an oplock break within a compound SMB2 request. via cbff488 Remove the compound_related_in_progress state from the smb2 global state. via 10cbcfd The core of the fix to allow opens to go async inside a compound request. via 1102e73 Move a variable into the area of code where it's used. via a026fc6 Ensure we don't try and cancel anything that is in a compound-related request. via 4111fcf Only do the 1 second delay for sharing violations for SMB1, not SMB2. from 637887c Makefile: Fix bug 9868 - Don't know how to make LIBNDR_PREG_OBJ. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 76bffc27a3f9ad6ac6b8ff8e21f801012835b73d Author: Richard Sharpe realrichardsha...@gmail.com Date: Thu May 2 14:36:05 2013 -0700 Tests processing an oplock break within a compound SMB2 request. Signed-off-by: Richard Sharpe realrichardsha...@gmail.com Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Richard Sharpe sha...@samba.org Autobuild-Date(master): Tue May 7 19:45:36 CEST 2013 on sn-devel-104 commit cbff4885508e050bcb91c0faccb26941de5c1e1d Author: Jeremy Allison j...@samba.org Date: Thu May 2 14:16:22 2013 -0700 Remove the compound_related_in_progress state from the smb2 global state. And also remove the restriction that we can't read a new request whilst we're in this state. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@samba.org commit 10cbcfd167a4d7b1a22f9b42b684a66e424cbede Author: Jeremy Allison j...@samba.org Date: Thu May 2 13:55:53 2013 -0700 The core of the fix to allow opens to go async inside a compound request. This is only allowed for opens that cause an oplock break, otherwise it is not allowed. See [MS-SMB2].pdf note 194 on Section 3.3.5.2.7. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com commit 1102e73832f78ca5decc928d6c3649d4fe68eab7 Author: Jeremy Allison j...@samba.org Date: Thu May 2 13:08:16 2013 -0700 Move a variable into the area of code where it's used. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com commit a026fc6b699719309a27d4646d06fe1a45b0d158 Author: Jeremy Allison j...@samba.org Date: Thu May 2 12:34:54 2013 -0700 Ensure we don't try and cancel anything that is in a compound-related request. Too hard to deal with splitting off the replies. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com commit 4111fcfd4f570d39d46a0d414546ca62c7b609be Author: Jeremy Allison j...@samba.org Date: Thu May 2 11:12:47 2013 -0700 Only do the 1 second delay for sharing violations for SMB1, not SMB2. Match Windows behavior. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com --- Summary of changes: selftest/knownfail |1 + source3/smbd/globals.h |1 - source3/smbd/open.c |3 +- source3/smbd/smb2_server.c | 115 +++- source4/torture/smb2/compound.c | 163 +++ 5 files changed, 227 insertions(+), 56 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/knownfail b/selftest/knownfail index 0c96eee..cb7630f 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -107,6 +107,7 @@ ^samba4.smb2.rename.no_share_delete_no_delete_access\(.*\)$ ^samba4.smb2.rename.msword ^samba4.smb2.compound.related3 +^samba4.smb2.compound.compound-break ^samba4.winbind.struct.*.show_sequence # Not yet working in winbind ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate\(.*\)$ ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand\(.*\)$ diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 46baeed..d618aea 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -794,7 +794,6 @@ struct smbd_server_connection { uint32_t max_trans; uint32_t max_read; uint32_t max_write; - bool compound_related_in_progress; } smb2; struct smbXsrv_connection *conn; diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 7d02e52..53f8b8e 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2526,10 +2526,11 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, /* * If we're returning a share violation, ensure we -* cope with the braindead 1 second delay. +* cope with
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2013-05-08-0417/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-05-08-0417/samba3.stderr http://git.samba.org/autobuild.flakey/2013-05-08-0417/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-05-08-0417/samba.stderr http://git.samba.org/autobuild.flakey/2013-05-08-0417/samba.stdout The top commit at the time of the failure was: commit 76bffc27a3f9ad6ac6b8ff8e21f801012835b73d Author: Richard Sharpe realrichardsha...@gmail.com Date: Thu May 2 14:36:05 2013 -0700 Tests processing an oplock break within a compound SMB2 request. Signed-off-by: Richard Sharpe realrichardsha...@gmail.com Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Richard Sharpe sha...@samba.org Autobuild-Date(master): Tue May 7 19:45:36 CEST 2013 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via fa5898b Remove a bunch of unused variable _relative_save_offset warnings. from 76bffc2 Tests processing an oplock break within a compound SMB2 request. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fa5898b6de797431d5ae9d2ce6dcddcb35a60b66 Author: Jeremy Allison j...@samba.org Date: Tue May 7 17:07:10 2013 -0700 Remove a bunch of unused variable _relative_save_offset warnings. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com Autobuild-User(master): Richard Sharpe sha...@samba.org Autobuild-Date(master): Wed May 8 07:47:45 CEST 2013 on sn-devel-104 --- Summary of changes: pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 5ffb678..ed86571 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -1157,8 +1157,10 @@ sub ParseElementPullLevel $self-indent; if ($l-{POINTER_TYPE} eq relative or $l-{POINTER_TYPE} eq relative_short) { - $self-pidl(uint32_t _relative_save_offset;); - $self-pidl(_relative_save_offset = $ndr-offset;); + if ($l-{POINTER_TYPE} eq relative) { + $self-pidl(uint32_t _relative_save_offset;); + $self-pidl(_relative_save_offset = $ndr-offset;); + } $self-pidl(NDR_CHECK(ndr_pull_relative_ptr2($ndr, $var_name));); } } -- Samba Shared Repository