[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  ec38098 s4:partition LDB module - fix handling regarding special DNs on searches
       via  793f1a5 s4:torture/rpc/samr.c - use "NULL" instead of "0" when initialising pointers
       via  0e5f863 s4:join.py - fix typo
      from  383a918 s3: allow to set TCP_NODELAYACK socket option on AIX

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ec38098c293ae06565dffc4bc58d72eba2b31ed3
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Thu Oct 20 22:00:15 2011 +0200

    s4:partition LDB module - fix handling regarding special DNs on searches
    
    Normally they should always be passed to the main backend unless
    something different has been specified.
    
    Reviewed-by: abartlet
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Tue Nov 15 22:43:06 CET 2011 on sn-devel-104

commit 793f1a547809172618e5b4071bc9a8160e7c7824
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 13 21:33:09 2011 +0100

    s4:torture/rpc/samr.c - use "NULL" instead of "0" when initialising pointers

commit 0e5f8634fc503112ce69e4b5ac7a53f0b6b9ab75
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 13 21:13:59 2011 +0100

    s4:join.py - fix typo

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/samdb/ldb_modules/partition.c |    5 +++++
 source4/scripting/python/samba/join.py     |    2 +-
 source4/torture/rpc/samr.c                 |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 92918c7..7bf109c 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -585,6 +585,11 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
 		return ldb_next_request(module, req);
 	}
 
+	/* Special DNs without specified partition should go further */
+	if (ldb_dn_is_special(req->op.search.base)) {
+		return ldb_next_request(module, req);
+	}
+
 	/* Locate the options */
 	domain_scope = (search_options
 		&& (search_options->search_options & LDB_SEARCH_OPTION_DOMAIN_SCOPE))
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 96b07a6..4252a2d 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -742,7 +742,7 @@ class dc_join(object):
             return blob
 
         print "Setup domain trusts with server %s" % ctx.server
-        binding_options = ""  # why doesn't signing work gere? w2k8r2 claims no session key
+        binding_options = ""  # why doesn't signing work here? w2k8r2 claims no session key
         lsaconn = lsa.lsarpc("ncacn_np:%s[%s]" % (ctx.server, binding_options),
                              ctx.lp, ctx.creds)
 
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index cc2cdfc..6b90791 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -7827,7 +7827,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b,
 
 	torture_comment(tctx, "Testing samr_Connect\n");
 
-	r.in.system_name = 0;
+	r.in.system_name = NULL;
 	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.connect_handle = &h;
 


-- 
Samba Shared Repository