[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a97507a spoolss: purge the printer name cache on name change from 2d4db4a s3: libsmbclient: After getting attribute server, ensure main srv pointer is still valid. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a97507a9a7ba01beead6a621e1210618e93a9f9c Author: David Disseldorp Date: Wed Apr 1 01:03:13 2015 +0200 spoolss: purge the printer name cache on name change Currently the name cache is only cleared on printer deletion. This means that if a printer undergoes a name change, the old name remains in the cache and can be subsequently used incorrecly if another printer takes the same name as the old. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11210 Reported-by: Franz Pförtsch Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Apr 14 05:37:50 CEST 2015 on sn-devel-104 --- Summary of changes: source3/rpc_server/spoolss/srv_spoolss_nt.c | 6 ++ 1 file changed, 6 insertions(+) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index d61b072c..65a805a 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -6479,6 +6479,9 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, snum, printer->sharename ? printer->sharename : ""); } + + /* name change, purge any cache entries for the old */ + prune_printername_cache(); } if (printer->printername != NULL && @@ -6515,6 +6518,9 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, notify_printer_printername(server_event_context(), msg_ctx, snum, p ? p : ""); } + + /* name change, purge any cache entries for the old */ + prune_printername_cache(); } if (printer->portname != NULL && -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2d4db4a s3: libsmbclient: After getting attribute server, ensure main srv pointer is still valid. from 2a6e170 witness: add WITNESS_UNSPECIFIED_VERSION to IDL. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2d4db4a65e1e8924470741378fe249f22196eceb Author: Jeremy Allison Date: Tue Mar 31 14:40:23 2015 -0700 s3: libsmbclient: After getting attribute server, ensure main srv pointer is still valid. Bug #11186: Crash seen in libsmbclient due to free of server structure during SMBC_getxattr() call Bug: https://bugzilla.samba.org/show_bug.cgi?id=11186 Signed-off-by: Jeremy Allison Reviewed-by: David Disseldorp Autobuild-User(master): David Disseldorp Autobuild-Date(master): Tue Apr 14 02:58:43 CEST 2015 on sn-devel-104 --- Summary of changes: source3/libsmb/libsmb_xattr.c | 41 + 1 file changed, 41 insertions(+) Changeset truncated at 500 lines: diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c index 8493776..9f7bea8 100644 --- a/source3/libsmb/libsmb_xattr.c +++ b/source3/libsmb/libsmb_xattr.c @@ -2073,6 +2073,25 @@ SMBC_getxattr_ctx(SMBCCTX *context, if (! srv->no_nt_session) { ipc_srv = SMBC_attr_server(frame, context, server, port, share, &workgroup, &user, &password); + /* +* SMBC_attr_server() can cause the original +* server to be removed from the cache. +* If so we must error out here as the srv +* pointer has been freed. +*/ + if (smbc_getFunctionGetCachedServer(context)(context, + server, + share, + workgroup, + user) != srv) { +#if defined(ECONNRESET) + errno = ECONNRESET; +#else + errno = ETIMEDOUT; +#endif + TALLOC_FREE(frame); + return -1; + } if (! ipc_srv) { srv->no_nt_session = True; } @@ -2208,9 +2227,31 @@ SMBC_removexattr_ctx(SMBCCTX *context, } if (! srv->no_nt_session) { + int saved_errno; ipc_srv = SMBC_attr_server(frame, context, server, port, share, &workgroup, &user, &password); + saved_errno = errno; + /* +* SMBC_attr_server() can cause the original +* server to be removed from the cache. +* If so we must error out here as the srv +* pointer has been freed. +*/ + if (smbc_getFunctionGetCachedServer(context)(context, + server, + share, + workgroup, + user) != srv) { +#if defined(ECONNRESET) + errno = ECONNRESET; +#else + errno = ETIMEDOUT; +#endif + TALLOC_FREE(frame); + return -1; + } if (! ipc_srv) { + errno = saved_errno; srv->no_nt_session = True; } } else { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2a6e170 witness: add WITNESS_UNSPECIFIED_VERSION to IDL. via 11586f1 s4-torture: skip witness_AsyncNotify test for now. via fbd1c24 s4-torture: add witness torture rpc testsuite. via 737fc04 srvsvc: add cluster specific share types to IDL. via 19cc0d7 s4-torture: add witness torture ndr testsuite. via 1307401 librpc: further fixes for witness.idl. from 0c6c081 s4:torture/winbind: add torture:winbindd_domain_without_prefix option https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2a6e170096e5b86918fa4f150e511e8dd08a63ec Author: Günther Deschner Date: Mon Apr 13 13:05:59 2015 +0200 witness: add WITNESS_UNSPECIFIED_VERSION to IDL. This version is seen in witness_GetInterfaceList replies from Windows Server 2012 R2. Guenther Signed-off-by: Guenther Deschner Reviewed-by: Stefan Metzmacher Autobuild-User(master): Günther Deschner Autobuild-Date(master): Mon Apr 13 15:44:42 CEST 2015 on sn-devel-104 commit 11586f16479cd728fe4d84020a05939ab33dae73 Author: Günther Deschner Date: Thu Apr 2 13:19:59 2015 +0200 s4-torture: skip witness_AsyncNotify test for now. We need to use real async calls in this test and add some clusapi commands so we can remotely modify the cluster to actually trigger notifications. Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher commit fbd1c2450685c8ac690d833e02d503c97bd9b40e Author: Günther Deschner Date: Fri Jan 16 13:49:46 2015 +0100 s4-torture: add witness torture rpc testsuite. Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher commit 737fc0410e6079060766ab2f6937d8b2ee5a7998 Author: Günther Deschner Date: Mon Feb 23 15:34:35 2015 +0100 srvsvc: add cluster specific share types to IDL. Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher commit 19cc0d70cb2f36b0659021a05194eb500afa7dcb Author: Günther Deschner Date: Fri Jan 16 13:43:01 2015 +0100 s4-torture: add witness torture ndr testsuite. Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher commit 130740100b2473448b3f530d1a0c463d7bbfa236 Author: Gregor Beck Date: Tue Feb 4 15:43:39 2014 +0100 librpc: further fixes for witness.idl. Signed-off-by: Gregor Beck Reviewed-by: Guenther Deschner Reviewed-by: Stefan Metzmacher --- Summary of changes: librpc/idl/srvsvc.idl | 11 +- librpc/idl/witness.idl | 62 - selftest/skip | 1 + source3/rpcclient/cmd_witness.c | 10 +- source4/torture/ndr/ndr.c | 1 + source4/torture/ndr/witness.c | 316 ++ source4/torture/rpc/rpc.c | 1 + source4/torture/rpc/witness.c | 579 source4/torture/wscript_build | 6 +- 9 files changed, 968 insertions(+), 19 deletions(-) create mode 100644 source4/torture/ndr/witness.c create mode 100644 source4/torture/rpc/witness.c Changeset truncated at 500 lines: diff --git a/librpc/idl/srvsvc.idl b/librpc/idl/srvsvc.idl index 96f85e6..db804e5 100644 --- a/librpc/idl/srvsvc.idl +++ b/librpc/idl/srvsvc.idl @@ -414,7 +414,16 @@ import "misc.idl", "security.idl", "svcctl.idl"; STYPE_DEVICE_HIDDEN= STYPE_DEVICE|STYPE_HIDDEN, STYPE_IPC = 3, /* Interprocess communication (IPC) */ STYPE_IPC_TEMPORARY = STYPE_IPC|STYPE_TEMPORARY, - STYPE_IPC_HIDDEN= STYPE_IPC|STYPE_HIDDEN + STYPE_IPC_HIDDEN= STYPE_IPC|STYPE_HIDDEN, + STYPE_CLUSTER_FS= 0x0200, /* A cluster share */ + STYPE_CLUSTER_FS_TEMPORARY = STYPE_CLUSTER_FS|STYPE_TEMPORARY, + STYPE_CLUSTER_FS_HIDDEN = STYPE_CLUSTER_FS|STYPE_HIDDEN, + STYPE_CLUSTER_SOFS = 0x0400, /* A Scale-Out cluster share */ + STYPE_CLUSTER_SOFS_TEMPORARY= STYPE_CLUSTER_SOFS|STYPE_TEMPORARY, + STYPE_CLUSTER_SOFS_HIDDEN = STYPE_CLUSTER_SOFS|STYPE_HIDDEN, + STYPE_CLUSTER_DFS = 0x0800, /* A DFS share in a cluster */ + STYPE_CLUSTER_DFS_TEMPORARY = STYPE_CLUSTER_DFS|STYPE_TEMPORARY, + STYPE_CLUSTER_DFS_HIDDEN= STYPE_CLUSTER_DFS|STYPE_HIDDEN } srvsvc_ShareType; typedef struct { diff --git a/librpc/idl/witness.idl b/librpc/idl/witness.idl index cf60536..8f5f9bf 100644 --- a/librpc/idl/witness.idl +++ b/librpc/idl/witness.idl @@ -13,7 +13,8 @@ interface witness { typedef [v1_enum] enum { WITNESS_V1 = 0x00010001, -
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/2015-04-13-1538/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-04-13-1538/samba.stderr http://git.samba.org/autobuild.flakey/2015-04-13-1538/samba.stdout The top commit at the time of the failure was: commit 0c6c081dc4e743c142a59d90c9e7f5b6e4cf5bd1 Author: Stefan Metzmacher Date: Sat Mar 28 10:04:30 2015 +0100 s4:torture/winbind: add torture:winbindd_domain_without_prefix option We should not assume that names in the domain specified by 'torture:winbindd_netbios_domain' have no DOMAIN\ prefix. On an AD DC we prefix all principals. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11183 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Apr 9 19:35:38 CEST 2015 on sn-devel-104