[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 a...@samba.org
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 a...@samba.org
---
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
[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 me...@samba.org 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); + CHECK_STATUS(status, NT_STATUS_OK); +
[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 a...@cryptomilk.org
Date: Fri Oct 26 12:46:21 2012 +0200
packaging: Add NetworkManager dispatcher script for winbind.
Signed-off-by: Andreas Schneider a...@cryptomilk.org
Signed-off-by: Andreas Schneider a...@samba.org
https://bugzilla.samba.org/show_bug.cgi?id=9336
Add NetworkManager dispatcher script for winbind (systemd) (edit)
Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-0-test): Wed Oct 31 11:36:42 CET 2012 on sn-devel-104
commit 1ce06808962e62cc2f9c8f2c58eb488f3ff0df59
Author: Andreas Schneider a...@samba.org
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 a...@samba.org
commit b5a9e1799d4e270a7061834d6a48d9effb29dedb
Author: Andrew Bartlett abart...@samba.org
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 b...@sernet.de
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 v...@samba.org
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 b...@sernet.de
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
[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 ksee...@samba.org
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 ksee...@samba.org
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; imax_len name[i]; i++ ) {
/* fail if strchr_m() finds one of the invalid characters */
if ( name[i] strchr_m( invalid_chars, name[i] ) ) {
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index fa8db04..f7fbfce 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -733,7 +733,8 @@ static int xattr_tdb_connect(vfs_handle_struct *handle,
const char *service,
return res;
}
- snum = find_service(service, sname);
+ fstrcpy(sname, service);
+ snum = find_service(sname);
if (snum == -1) {
/*
* Should not happen, but we should not fail just *here*.
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index eaff9e6..8c1cf09 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -9471,10 +9471,15 @@ struct share_params *get_share_params(TALLOC_CTX
*mem_ctx,
const char *sharename)
{
struct share_params *result;
- fstring sname;
+ char *sname;
int snum;
- snum = find_service(sharename, sname);
+ if (!(sname = SMB_STRDUP(sharename))) {
+ return NULL;
+ }
+
+ snum = find_service(sname);
+ SAFE_FREE(sname);
if (snum 0) {
return NULL;
diff --git a/source3/printing/nt_printing.c
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 j...@samba.org 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 j...@samba.org Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Wed Oct 31 03:21:38 CET 2012 on sn-devel-104
[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 b...@sernet.de
Date: Wed Oct 31 15:31:08 2012 +0100
util: remove accidently committed hunk
Autobuild-User(master): Björn Jacke b...@sernet.de
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
