[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  12f2170 s3-selftest: properly move connect to seal options.
       via  286530b s3-selftest: no point in testing smb2 via ncacn_ip_tcp.
       via  05b447b s3-selftest: remove *ncacn_ip_tcp* from knownfail list.
       via  a299993 socket_wrapper: fix handling of addr and addrlen
       via  f0d59bb s3-rpc_server: handle DCERPC_AUTH_LEVEL_CONNECT in api_pipe_bind_req().
      from  5a59dcc s4:samba-tool: improve help messages for samba-tool password

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


- Log -----------------------------------------------------------------
commit 12f2170a2b31b0285c2d2421a333457efdf1be6b
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 9 12:26:21 2011 +0100

    s3-selftest: properly move connect to seal options.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Mar  9 13:13:06 CET 2011 on sn-devel-104

commit 286530b3fe6585fad930982bb16418535572ff38
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 9 12:14:10 2011 +0100

    s3-selftest: no point in testing smb2 via ncacn_ip_tcp.
    
    Guenther

commit 05b447b26fa223777fdeeacd32892329312caad3
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 9 12:06:08 2011 +0100

    s3-selftest: remove *ncacn_ip_tcp* from knownfail list.
    
    Guenther

commit a29999392af7085a65714c92029733a1c2dfbe85
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 9 11:46:34 2011 +0100

    socket_wrapper: fix handling of addr and addrlen
    
    metze

commit f0d59bb3cf76c5cc83638ed6ef13083fe56659b5
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 8 18:26:56 2011 +0100

    s3-rpc_server: handle DCERPC_AUTH_LEVEL_CONNECT in api_pipe_bind_req().
    
    Guenther

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

Summary of changes:
 lib/socket_wrapper/socket_wrapper.c |    9 +++++----
 source3/rpc_server/srv_pipe.c       |    3 +++
 source3/selftest/knownfail          |    1 -
 source3/selftest/tests.py           |   26 +++++++++++++++-----------
 4 files changed, 23 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index cd91327..6eb4979 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -1538,10 +1538,11 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
 	child_si->peername = sockaddr_dup(my_addr, len);
 
 	if (addr != NULL && addrlen != NULL) {
-	    *addrlen = len;
-	    if (*addrlen >= len)
-		memcpy(addr, my_addr, len);
-	    *addrlen = 0;
+		size_t copy_len = MIN(*addrlen, len);
+		if (copy_len > 0) {
+			memcpy(addr, my_addr, copy_len);
+		}
+		*addrlen = len;
 	}
 
 	ret = real_getsockname(fd, (struct sockaddr *)(void *)&un_my_addr,
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index f941f33..234422c 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -990,6 +990,9 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
 		case DCERPC_AUTH_LEVEL_NONE:
 			p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
 			break;
+		case DCERPC_AUTH_LEVEL_CONNECT:
+			p->auth.auth_level = DCERPC_AUTH_LEVEL_CONNECT;
+			break;
 		default:
 			DEBUG(0, ("Unexpected auth level (%u).\n",
 				(unsigned int)auth_info.auth_level ));
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index dfc2cee..574910c 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -7,4 +7,3 @@ samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermitt
 samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure
 .*driver.add_driver_timestamps # we only can store dates, not timestamps
 samba3.raw.mux.* #This test is flaky on the async lock time
-.*ncacn_ip_tcp.*
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 34991a4..d9ea831 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -196,16 +196,20 @@ if sub.returncode == 0:
             plansmbtorturetestsuite(t, "dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
 
     test = 'rpc.lsa.lookupsids'
-    transports = ["ncacn_np", "ncacn_ip_tcp" ]
-    auth_options = ["ntlm", "spnego", "connect" ]
-    signseal_options = ["", ",sign", ",sign,seal"]
+    auth_options = ["", "ntlm", "spnego" ]
+    signseal_options = ["", ",connect", ",sign", ",seal"]
     smb_options = ["", ",smb2"]
     endianness_options = ["", ",bigendian"]
-    for t in transports:
-        for z in smb_options:
-            for e in endianness_options:
-                for a in auth_options:
-                    for s in signseal_options:
-                        binding_string = "%s:$SERVER_IP[%s%s%s%s]" % (t, a, s, z, e)
-                        options = binding_string + " -U$USERNAME%$PASSWORD"
-                        plansmbtorturetestsuite(test, "dc", options, 'over %s with [%s%s%s%s] ' % (t, a, s, z, e))
+    for z in smb_options:
+        for e in endianness_options:
+            for a in auth_options:
+                for s in signseal_options:
+                    binding_string = "ncacn_np:$SERVER_IP[%s%s%s%s]" % (a, s, z, e)
+                    options = binding_string + " -U$USERNAME%$PASSWORD"
+                    plansmbtorturetestsuite(test, "dc", options, 'over ncacn_np with [%s%s%s%s] ' % (a, s, z, e))
+    for e in endianness_options:
+        for a in auth_options:
+            for s in signseal_options:
+                binding_string = "ncacn_ip_tcp:$SERVER_IP[%s%s%s]" % (a, s, e)
+                options = binding_string + " -U$USERNAME%$PASSWORD"
+                plansmbtorturetestsuite(test, "dc", options, 'over ncacn_ip_tcp with [%s%s%s] ' % (a, s, e))


-- 
Samba Shared Repository