[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via dd60dcf test-chgdcpass: test the ldap case for server password change via 0e6c5c0 s4-ldapclient: cope with logon failure retry in LDAP via b0cc0d5 s4-librpc: set error code to LOGON_FAILURE on RPC fault with access denied via 538dd04 samba-tool: "drs options" does not need a samdb connection via 5d6ae34 s4-librpc: try a 2nd logon for more error cases via 30ffdda ldb: fixed callers for ldb_pack_data() and ldb_unpack_data() via fc47b0d ldb: move ldb_pack.c into common via e480995 test_chgdpass: use drs bind to test password change on RPC via ed2e69f s4-librpc: use cli_credentials_failed_kerberos_login to cope with stale tickets via fce66b2 test_chgdpass: added test for kerberos retry via d4ea637 libcli: use cli_credentials_failed_kerberos_login() to cope with server changes via 994696c auth: added cli_credentials_failed_kerberos_login() from ffb608b util: remove accidently committed hunk http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dd60dcf343bfb8286951d3109055693634574d8b Author: Andrew Tridgell Date: Thu Nov 1 14:11:02 2012 +1100 test-chgdcpass: test the ldap case for server password change use samba-tool drs options which does both RPC and LDAP connections Pair-Programmed-With: Andrew Bartlett Autobuild-User(master): Andrew Tridgell Autobuild-Date(master): Thu Nov 1 07:21:17 CET 2012 on sn-devel-104 commit 0e6c5c036f8faddcc6ca65c26453ffaf248ed2b5 Author: Andrew Tridgell Date: Thu Nov 1 14:10:14 2012 +1100 s4-ldapclient: cope with logon failure retry in LDAP similar to what was done for rpc and cifs, we now retry once on logon failure for ldap, allowing for a new ticket to be fetched when a server password changes while we have a valid ticket for the old password Pair-Programmed-With: Andrew Bartlett commit b0cc0d5698d34aa7956b22faa8b79bd9b338286d Author: Andrew Tridgell Date: Thu Nov 1 13:42:52 2012 +1100 s4-librpc: set error code to LOGON_FAILURE on RPC fault with access denied this allows the client code to trigger a retry with a new password callback for NTLM connections Pair-Programmed-With: Andrew Bartlett commit 538dd046f1efefbeb8660ef1ff5afd594a003341 Author: Andrew Tridgell Date: Thu Nov 1 13:31:47 2012 +1100 samba-tool: "drs options" does not need a samdb connection this gives us a handy pure RPC client test for use in blackbox testing Pair-Programmed-With: Andrew Bartlett commit 5d6ae3498ad77ccdb7a8b3a316d7aa86c2f0c56a Author: Andrew Tridgell Date: Thu Nov 1 13:30:47 2012 +1100 s4-librpc: try a 2nd logon for more error cases not all servers give LOGON_FAILURE on authentication failures, so we need to do the retry with a new ticket on a wider range of error types Pair-Programmed-With: Andrew Bartlett commit 30ffdda45bd3ae602b453c9c1bbdb77ea3de8a8d Author: Andrew Tridgell Date: Wed Oct 31 16:06:03 2012 +1100 ldb: fixed callers for ldb_pack_data() and ldb_unpack_data() with ltdb_pack_data() and ltdb_unpack_data() now moved into common, we need to increase the minor version and fixup callers of the API Note that this relies on struct ldb_val being the same shape as TDB_DATA, in much the same way as we rely on ldb_val and DATA_BLOB being the same shape. Pair-Programmed-With: Andrew Bartlett commit fc47b0d03c577730ce0ef9e09092f80c0712d5d0 Author: Andrew Tridgell Date: Wed Oct 31 15:39:09 2012 +1100 ldb: move ldb_pack.c into common this code should not be tied to the ldb_tdb backend, both because it could be used for any record oriented backend, and because it should be exposed for use by diagnosis/repair tools such as the recently added ldbdump tool Pair-Programmed-With: Andrew Bartlett commit e48099516e4975cb69c7e2850d3b13b25bab7c44 Author: Andrew Tridgell Date: Wed Oct 31 18:45:25 2012 +1100 test_chgdpass: use drs bind to test password change on RPC Pair-Programmed-With: Andrew Bartlett commit ed2e69fe91fee642392803a17d42d64adc36e41d Author: Andrew Tridgell Date: Wed Oct 31 18:44:23 2012 +1100 s4-librpc: use cli_credentials_failed_kerberos_login to cope with stale tickets This allows our RPC client code to cope with a kerberos server changing password while we have a valid service ticket Pair-Programmed-With: Andrew Bartlett commit fce66b22ea312abb252fb9dc748b3adc6fbab49f Author: Andrew Tridgell Date: Wed Oct 31 18:00:43 2012 +1100 test_chgdpass: added test for kerberos retry this tests that we correctly retry with a new ccache entry when a server changes its password while we have a valid ticket Pair-Programmed-With: Andrew
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ffb608b util: remove accidently committed hunk
from 59e9661 Add regression test for bug #9329 - Directory listing with
SeBackup can crash smbd.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ffb608b54d452e2c96222840f1bd48759f32d0b5
Author: Björn Jacke
Date: Wed Oct 31 15:31:08 2012 +0100
util: remove accidently committed hunk
Autobuild-User(master): Björn Jacke
Autobuild-Date(master): Wed Oct 31 19:25:30 CET 2012 on sn-devel-104
---
Summary of changes:
lib/util/util_net.c |3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 536c0a4..83afda4 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -817,9 +817,6 @@ static const smb_socket_option socket_options[] = {
#ifdef TCP_QUICKACK
{"TCP_QUICKACK", IPPROTO_TCP, TCP_QUICKACK, 0, OPT_BOOL},
#endif
-#ifdef TCP_FASTOPEN
- {"TCP_FASTOPEN", IPPROTO_TCP, TCP_FASTOPEN, 0, OPT_BOOL},
-#endif
#ifdef TCP_NODELAYACK
{"TCP_NODELAYACK", IPPROTO_TCP, TCP_NODELAYACK, 0, OPT_BOOL},
#endif
--
Samba Shared Repository
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/2012-10-31-1606/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-10-31-1606/samba3.stderr http://git.samba.org/autobuild.flakey/2012-10-31-1606/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-10-31-1606/samba.stderr http://git.samba.org/autobuild.flakey/2012-10-31-1606/samba.stdout The top commit at the time of the failure was: commit 59e9661de2dd19808295002f1329b27d5dca09e6 Author: Jeremy Allison Date: Mon Oct 29 14:49:36 2012 -0700 Add regression test for bug #9329 - Directory listing with SeBackup can crash smbd. Ensure we exercise the SeBackup code path on directory listings. Signed-off-by: Jeremy Allison Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Wed Oct 31 03:21:38 CET 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 92bd768 Revert "Fix bug #7781 (Samba transforms "ShareName" to
lowercase when adding new share via MMC)"
via 79564b8 Revert "Revert "s3-smbd: Don't segfault if user specified
ports out for range.""
from fce3a18 Revert "s3-smbd: Don't segfault if user specified ports out
for range."
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 92bd768ed56585c2a45d0ca41eec9e6a1e3701ae
Author: Karolin Seeger
Date: Wed Oct 31 11:40:26 2012 +0100
Revert "Fix bug #7781 (Samba transforms "ShareName" to lowercase when
adding new share via MMC)"
This reverts commit 157b88da4db727eafa682c7fc7eab11d5955f57b.
This one seems to break make test on my system.
Karolin
commit 79564b889dba69fa39d9839e5d45457657ab0950
Author: Karolin Seeger
Date: Wed Oct 31 11:39:34 2012 +0100
Revert "Revert "s3-smbd: Don't segfault if user specified ports out for
range.""
This reverts commit fce3a18d3d5ed46f8e0d1653f862e46b5dff0e03.
This patch does not seem to cause the issue. Sorry for the noise.
Karolin
---
Summary of changes:
source3/include/proto.h |2 +-
source3/lib/dummysmbd.c |2 +-
source3/lib/util_str.c |4 --
source3/modules/vfs_xattr_tdb.c |3 +-
source3/param/loadparm.c|9 +++-
source3/printing/nt_printing.c | 12 -
source3/registry/reg_backend_printing.c |7 +--
source3/rpc_server/srv_srvsvc_nt.c | 75 ++-
source3/smbd/lanman.c | 14 ++
source3/smbd/msdfs.c|3 +-
source3/smbd/server.c | 23 +-
source3/smbd/service.c | 16 ++-
source3/smbd/smb2_tcon.c|2 +-
13 files changed, 82 insertions(+), 90 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index cee5d6a..785cc30 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7002,7 +7002,7 @@ bool set_conn_connectpath(connection_struct *conn, const
char *connectpath);
bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir);
void load_registry_shares(void);
int add_home_service(const char *service, const char *username, const char
*homedir);
-int find_service(const char *service_in, fstring service);
+int find_service(fstring service);
connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
int snum, user_struct *vuser,
DATA_BLOB password,
diff --git a/source3/lib/dummysmbd.c b/source3/lib/dummysmbd.c
index 28c6f0e..a41e6dc 100644
--- a/source3/lib/dummysmbd.c
+++ b/source3/lib/dummysmbd.c
@@ -28,7 +28,7 @@ int get_client_fd(void)
return -1;
}
-int find_service(const char *service_in, fstring service)
+int find_service(fstring service)
{
return -1;
}
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 17a4a8f..d869637 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -2301,10 +2301,6 @@ bool validate_net_name( const char *name,
{
int i;
- if (!name) {
- return false;
- }
-
for ( i=0; idriver_name, r->version));
- printdollar_snum = find_service("print$", printdollar);
+ fstrcpy(printdollar, "print$");
+
+ printdollar_snum = find_service(printdollar);
if (printdollar_snum == -1) {
return false;
}
diff --git a/source3/registry/reg_backend_printing.c
b/source3/registry/reg_backend_printing.c
index cba4f79..90ccc33 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -278,7 +278,7 @@ done:
static bool add_printers_by_registry( struct regsubkey_ctr *subkeys )
{
int i, num_keys, snum;
- char *printername_in;
+ char *printername;
NT_PRINTER_INFO_LEVEL_2 info2;
NT_PRINTER_INFO_LEVEL printer;
@@ -289,9 +289,8 @@ static bool add_printers_by_registry( struct regsubkey_ctr
*subkeys )
become_root();
for ( i=0; iin.share_name) {
- return WERR_INVALID_NAME;
- }
+ fstrcpy(share_name, r->in.share_name);
- snum = find_service(r->in.share_name, share_name);
+ snum = find_service(share_name);
if (snum < 0) {
return WERR_INVALID_NAME;
}
@@ -1509,7 +1507,7 @@ WERROR _srvsvc_NetShareSetInfo(pipes_struct *p,
struct srvsvc_NetShareSetInfo *r)
{
char *command = NULL;
- fstring share_name;
+ char *share_name = NULL;
char *comment = NULL;
const char *
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via f40bfca packaging: Add NetworkManager dispatcher script for winbind.
via 1ce0680 BUG 9326: Fix net ads join message for the dns domain.
via b5a9e17 lib/replace: Return size of xattr if size argument is 0
via a210201 s3: vfs_streams_depot: add delete_lost option (bug #9300)
via 0c454c5 s3: make recursive_rmdir function non-static
from 7e100a2 WHATSNEW: Correct list of changed parameters.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit f40bfcaf4ce8e6a9001d843bbc48505b769d2777
Author: Andreas Schneider
Date: Fri Oct 26 12:46:21 2012 +0200
packaging: Add NetworkManager dispatcher script for winbind.
Signed-off-by: Andreas Schneider
Signed-off-by: Andreas Schneider
https://bugzilla.samba.org/show_bug.cgi?id=9336
Add NetworkManager dispatcher script for winbind (systemd) (edit)
Autobuild-User(v4-0-test): Karolin Seeger
Autobuild-Date(v4-0-test): Wed Oct 31 11:36:42 CET 2012 on sn-devel-104
commit 1ce06808962e62cc2f9c8f2c58eb488f3ff0df59
Author: Andreas Schneider
Date: Tue Oct 23 17:12:59 2012 +0200
BUG 9326: Fix net ads join message for the dns domain.
We don't get a realm back from the server which is useable as a realm on
Unix. On Unix they are case sensitive and on Windows they aren't. This
confuses uses and if we write realm they try to use it as it came back
in lowercase.
Signed-off-by: Andreas Schneider
commit b5a9e1799d4e270a7061834d6a48d9effb29dedb
Author: Andrew Bartlett
Date: Sat Oct 27 19:15:58 2012 +1100
lib/replace: Return size of xattr if size argument is 0
This makes rep_{f,}getxattr a more complete replacement for the linux
function.
Andrew Bartlett
https://bugzilla.samba.org/show_bug.cgi?id=9338
libreplace does not replace getxattr correctly for 0 length semantics
commit a210201abc243faeb78316559487c25a6e78d8ab
Author: Björn Baumbach
Date: Thu Sep 27 12:40:47 2012 +0200
s3: vfs_streams_depot: add delete_lost option (bug #9300)
With this option lost stream directories will be removed
instead of renamed.
Autobuild-User(master): Volker Lendecke
Autobuild-Date(master): Mon Oct 1 18:47:30 CEST 2012 on sn-devel-104
(cherry picked from commit 8da8a2289ea51d4fcdf6b5352a46c14d36d8f072)
commit 0c454c5810ff26967da40d01979bb55982a8a50f
Author: Björn Baumbach
Date: Mon Oct 1 09:55:28 2012 +0200
s3: make recursive_rmdir function non-static
Part of fix for bug #9300.
(cherry picked from commit 7a76762c688f4fc7519dbd204b036963c460e093)
---
Summary of changes:
lib/replace/xattr.c | 15 +-
packaging/NetworkManager/30-winbind-systemd | 20
packaging/NetworkManager/README |6 +++
source3/modules/vfs_streams_depot.c | 65 +-
source3/smbd/close.c|8 ++--
source3/smbd/proto.h|3 +
source3/utils/net_ads.c |2 +-
7 files changed, 88 insertions(+), 31 deletions(-)
create mode 100755 packaging/NetworkManager/30-winbind-systemd
create mode 100644 packaging/NetworkManager/README
Changeset truncated at 500 lines:
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index 8e1c989..a26ff67 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -71,7 +71,9 @@ ssize_t rep_getxattr (const char *path, const char *name,
void *value, size_t si
* that the buffer is large enough to fit the returned value.
*/
if((retval=extattr_get_file(path, attrnamespace, attrname, NULL, 0)) >=
0) {
- if(retval > size) {
+ if (size == 0) {
+ return retval;
+ } else if (retval > size) {
errno = ERANGE;
return -1;
}
@@ -88,6 +90,9 @@ ssize_t rep_getxattr (const char *path, const char *name,
void *value, size_t si
if (strncmp(name, "system", 6) == 0) flags |= ATTR_ROOT;
retval = attr_get(path, attrname, (char *)value, &valuelength, flags);
+ if (size == 0 && retval == -1 && errno == E2BIG) {
+ return valuelength;
+ }
return retval ? retval : valuelength;
#elif defined(HAVE_ATTROPEN)
@@ -126,7 +131,9 @@ ssize_t rep_fgetxattr (int filedes, const char *name, void
*value, size_t size)
const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
if((retval=extattr_get_fd(filedes, attrnamespace, attrname, NULL, 0))
>= 0) {
- if(retval > size) {
+ if (size == 0) {
+ return retval;
+ } else if (retval > size) {
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via e95da42 s4:torture/smb2: improve the smb2.create.blob test from 155d132 BUG 9326: Fix net ads join message for the dns domain. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit e95da423965cf332f6d0a849725cd0808c42c1e2 Author: Stefan Metzmacher Date: Wed Sep 19 21:18:46 2012 +0200 s4:torture/smb2: improve the smb2.create.blob test metze (cherry picked from commit e6c600aa2c751e694917322378417816c3e58eb6) See https://bugzilla.samba.org/show_bug.cgi?id=9209 for details. --- Summary of changes: source4/torture/smb2/create.c | 93 - 1 files changed, 91 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c index f11c837..3850a3c 100644 --- a/source4/torture/smb2/create.c +++ b/source4/torture/smb2/create.c @@ -444,14 +444,103 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "Testing bad tag length\n"); + torture_comment(tctx, "Testing bad tag length 0\n"); + ZERO_STRUCT(io.in.blobs); status = smb2_create_blob_add(tctx, &io.in.blobs, - "xxx", data_blob(NULL, 0)); + "x", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER); + + torture_comment(tctx, "Testing bad tag length 1\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "x", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER); + + torture_comment(tctx, "Testing bad tag length 2\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "xx", data_blob(NULL, 0)); CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER); + torture_comment(tctx, "Testing bad tag length 3\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "xxx", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER); + torture_comment(tctx, "Testing tag length 4\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + torture_comment(tctx, "Testing tag length 5\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "x", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + torture_comment(tctx, "Testing tag length 6\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "xx", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + torture_comment(tctx, "Testing tag length 7\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "xxx", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + torture_comment(tctx, "Testing tag length 8\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io); + CHECK_STATUS(status, NT_STATUS_OK); + + torture_comment(tctx, "Testing tag length 16\n"); + ZERO_STRUCT(io.in.blobs); + status = smb2_create_blob_add(tctx, &io.in.blobs, + "", data_blob(NULL, 0)); + CHECK_STATUS(status, NT_STATUS_OK); + status = smb2_create(tree, tctx, &io)
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 155d132 BUG 9326: Fix net ads join message for the dns domain.
from 11b798c pam_winbind: fix segfault in pam_sm_authenticate()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 155d132434e96d69bac31dd7413ecb4d4b09b017
Author: Andreas Schneider
Date: Tue Oct 23 17:12:59 2012 +0200
BUG 9326: Fix net ads join message for the dns domain.
We don't get a realm back from the server which is useable as a realm on
Unix. On Unix they are case sensitive and on Windows they aren't. This
confuses uses and if we write realm they try to use it as it came back
in lowercase.
Signed-off-by: Andreas Schneider
---
Summary of changes:
source3/utils/net_ads.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index f751d68..6a7bc53 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1436,7 +1436,7 @@ int net_ads_join(struct net_context *c, int argc, const
char **argv)
d_printf(_("Using short domain name -- %s\n"),
r->out.netbios_domain_name);
if (r->out.dns_domain_name) {
- d_printf(_("Joined '%s' to realm '%s'\n"), r->in.machine_name,
+ d_printf(_("Joined '%s' to dns domain '%s'\n"),
r->in.machine_name,
r->out.dns_domain_name);
} else {
d_printf(_("Joined '%s' to domain '%s'\n"), r->in.machine_name,
--
Samba Shared Repository
