[SCM] Samba Shared Repository - branch v3-4-test updated -
release-4-0-0alpha7-687-g367fb7b
Günther Deschner
gd at samba.org
Wed Apr 8 11:28:02 GMT 2009
The branch, v3-4-test has been updated
via 367fb7b7d28bcdd392ca60806a5f15b4ef260193 (commit)
via e674c9d469d9ae4d63cd34af04b2634f7c370573 (commit)
via 98000d20c189697da4f3e8a1c1207c1d7369cc78 (commit)
via 403834c88c8c45eb5d3eec4ba85a4fe7fd9a54f5 (commit)
from ee6fe209ef2df223434faddc9b0e5ade7a677234 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 367fb7b7d28bcdd392ca60806a5f15b4ef260193
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 13:11:16 2009 +0200
s3-selftest: add root for make test as well (not only make selftest).
Guenther
(cherry picked from commit fa7f2ffe5116dce69e89b990f816a32721474fb6)
commit e674c9d469d9ae4d63cd34af04b2634f7c370573
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 12:47:10 2009 +0200
s3-util-sock: add ismyaddr() check in is_myname_or_ipaddr().
Guenther
(cherry picked from commit 78951bd7f4d8bfe13691b3291151c8dedd8e29ef)
commit 98000d20c189697da4f3e8a1c1207c1d7369cc78
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 03:00:16 2009 +0200
s3-selftest: Samba3 passes RPC-SVCCTL so enable it during make test.
Guenther
(cherry picked from commit 403422e1ea8f654a9dee12566b8b28c09fe301c8)
commit 403834c88c8c45eb5d3eec4ba85a4fe7fd9a54f5
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 10:15:01 2009 +0200
selftest: add a fake root user to nss_wrapper_passwd in s3.
Needed to make some server calls to get_root_nt_token() succeed.
make selftest/make test gurus, please check.
Guenther
(cherry picked from commit 18d475cea92bd0de2fbb9c3251cb5b768795bce4)
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba3.pm | 1 +
source3/lib/util_sock.c | 4 ++++
source3/script/tests/selftest.sh | 1 +
source3/script/tests/test_posix_s3.sh | 1 +
4 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index e1bea16..96b32cc 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -519,6 +519,7 @@ sub provision($$$$$$)
open(PASSWD, ">$nss_wrapper_passwd") or die("Unable to open $nss_wrapper_passwd");
print PASSWD "nobody:x:65534:65533:nobody gecos:$prefix_abs:/bin/false
+root:x:65533:65532:root gecos:$prefix_abs:/bin/false
$unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
";
close(PASSWD);
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index a0dbca1..4c24d6f 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1942,6 +1942,10 @@ bool is_myname_or_ipaddr(const char *s)
return false;
}
+ if (ismyaddr((struct sockaddr *)&ss)) {
+ return true;
+ }
+
if (is_zero_addr((struct sockaddr *)&ss) ||
is_loopback_addr((struct sockaddr *)&ss)) {
return false;
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index a430d01..2fc35f1 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -268,6 +268,7 @@ EOF
##
cat >$NSS_WRAPPER_PASSWD<<EOF
+root:x:65533:65532:root gecos:$PREFIX_ABS:/bin/false
nobody:x:65534:65533:nobody gecos:$PREFIX_ABS:/bin/false
$USERNAME:x:$USERID:$GROUPID:$USERNAME gecos:$PREFIX_ABS:/bin/false
EOF
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 0885b13..2832d1d 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -40,6 +40,7 @@ raw="$raw RAW-SAMBA3ROOTDIRFID"
rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
+rpc="$rpc RPC-SVCCTL"
# NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
# config to allow guest access. I'm not sure whether this would break other
--
Samba Shared Repository
More information about the samba-cvs
mailing list