The branch, master has been updated
via 14cbc79 selftest: re-enable nss_winbind via nss_wrapper in the
test-envs.
via 88f7361 s4-selftest: push up the "users" gid to make gid collision
more unlikely.
via 8c819f3 s4:selftest: avoid creating two groups with GID 0 in
provision
via 26fc3eb s4:selftest: avoid creating two entries for UID 0 in
provision
via fd783b0 selftest: run the samba.nss tests against :local
environments
via 6cab59e selftest/knownfail: add newline to end of file.
from 8ca918f docs: Fix vfs_shadow_copy(8)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 14cbc791ee70316889d568c4ab2cc6424235aedc
Author: Günther Deschner <[email protected]>
Date: Mon Feb 2 14:54:01 2015 +0100
selftest: re-enable nss_winbind via nss_wrapper in the test-envs.
Without exporting these new variables, we can never access or test
nss_winbind
from the selftest environments.
This shows that our posixacl test probably needs fixing since now
two subtests fail against plugin_s4_dc:local. This env was just
not complete without winbind in nsswitch. The test failure is
probably due to the strangeness of the AD/DC setup that the
domain administrator uses the same uid as the root user, which
in the selftest case is overridden to be the calling user.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Pair-Programmed-With: Michael Adam <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Fri Feb 13 20:57:12 CET 2015 on sn-devel-104
commit 88f7361c211fce5d1a1a3a56bfa4297263c70fcd
Author: Günther Deschner <[email protected]>
Date: Thu Feb 5 16:07:35 2015 +0100
s4-selftest: push up the "users" gid to make gid collision more unlikely.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
commit 8c819f3c6b58d0138c2852c5b2d7c4dd17a54cd0
Author: Michael Adam <[email protected]>
Date: Tue Feb 3 14:59:06 2015 +0100
s4:selftest: avoid creating two groups with GID 0 in provision
Pair-Programmed-With: Guenther Deschner <[email protected]>
Signed-off-by: Michael Adam <[email protected]>
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 26fc3eba769166de75aac7831fa667abe83e0a31
Author: Michael Adam <[email protected]>
Date: Mon Feb 2 16:05:17 2015 +0100
s4:selftest: avoid creating two entries for UID 0 in provision
Pair-Programmed-With: Guenther Deschner <[email protected]>
Signed-off-by: Michael Adam <[email protected]>
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit fd783b04bb82feed75c41c6d96506dbe691d97f2
Author: Michael Adam <[email protected]>
Date: Sat Feb 7 12:16:30 2015 +0100
selftest: run the samba.nss tests against :local environments
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 6cab59e0162b6d8f274f25a59e5105ff40a84c83
Author: Michael Adam <[email protected]>
Date: Sat Feb 7 14:32:43 2015 +0100
selftest/knownfail: add newline to end of file.
git always complains about what vim does to the file...
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
selftest/knownfail | 12 ++++++++++--
selftest/selftest.pl | 2 ++
selftest/target/Samba4.pm | 20 +++++++++++---------
source4/selftest/tests.py | 2 +-
4 files changed, 24 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index 5fc05a0..fef56a1 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -271,7 +271,7 @@
^samba.blackbox.wbinfo\(s4member:local\).wbinfo --user-sids against
s4member\(s4member:local\)
^samba4.winbind.struct.getpwent\(plugin_s4_dc:local\)
^samba.wbinfo_simple.\(s4member:local\).--user-groups
-^samba.nss.test using winbind\(s4member\)
+^samba.nss.test using winbind\(s4member:local\)
#
# These just happen to fail for some reason (probably because they run against
the s4 winbind)
#
@@ -299,4 +299,12 @@
#
# Differences in our KDC compared to windows
#
-^samba4.krb5.kdc .*.as-req-pac-request # We should reply to a request for a
PAC over UDP with KRB5KRB_ERR_RESPONSE_TOO_BIG unconditionally
\ No newline at end of file
+^samba4.krb5.kdc .*.as-req-pac-request # We should reply to a request for a
PAC over UDP with KRB5KRB_ERR_RESPONSE_TOO_BIG unconditionally
+#
+# Test does not work, apparently because the calling user and
+# the domain admin use the same uid. This was uncovered by
+# enabling libnss_winbindd in the nsswrapper environment.
+# TODO: fix the test.
+#
+^samba.tests.posixacl.samba.tests.posixacl.PosixAclMappingTests.test_setntacl_sysvol_check_getposixacl\(plugin_s4_dc:local\)$
+^samba.tests.posixacl.samba.tests.posixacl.PosixAclMappingTests.test_setntacl_policies_check_getposixacl\(plugin_s4_dc:local\)$
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 2bbb3c8..72341f0 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -793,6 +793,8 @@ my @exported_envvars = (
"NSS_WRAPPER_PASSWD",
"NSS_WRAPPER_GROUP",
"NSS_WRAPPER_HOSTS",
+ "NSS_WRAPPER_MODULE_SO_PATH",
+ "NSS_WRAPPER_MODULE_FN_PREFIX",
# resolv_wrapper
"RESOLV_WRAPPER_CONF",
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 1cc74b7..da2009d 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -700,10 +700,11 @@ sub provision_raw_step1($$)
Samba::mk_krb5_conf($ctx, "");
open(PWD, ">$ctx->{nsswrap_passwd}");
- print PWD "
-root:x:0:0:root gecos:$ctx->{prefix_abs}:/bin/false
-$ctx->{unix_name}:x:$ctx->{unix_uid}:100:$ctx->{unix_name}
gecos:$ctx->{prefix_abs}:/bin/false
-nobody:x:65534:65533:nobody gecos:$ctx->{prefix_abs}:/bin/false
+ if ($ctx->{unix_uid} != 0) {
+ print PWD "root:x:0:0:root
gecos:$ctx->{prefix_abs}:/bin/false\n";
+ }
+ print PWD "$ctx->{unix_name}:x:$ctx->{unix_uid}:65531:$ctx->{unix_name}
gecos:$ctx->{prefix_abs}:/bin/false\n";
+ print PWD "nobody:x:65534:65533:nobody
gecos:$ctx->{prefix_abs}:/bin/false
pdbtest:x:65533:65533:pdbtest gecos:$ctx->{prefix_abs}:/bin/false
pdbtest2:x:65532:65533:pdbtest gecos:$ctx->{prefix_abs}:/bin/false
pdbtest3:x:65531:65533:pdbtest gecos:$ctx->{prefix_abs}:/bin/false
@@ -713,13 +714,14 @@ pdbtest4:x:65530:65533:pdbtest
gecos:$ctx->{prefix_abs}:/bin/false
my $uid_rfc2307test = 65533;
open(GRP, ">$ctx->{nsswrap_group}");
- print GRP "
-root:x:0:
-wheel:x:10:
-users:x:100:
+ if ($ctx->{unix_gid} != 0) {
+ print GRP "root:x:0:\n";
+ }
+ print GRP "$ctx->{unix_name}:x:$ctx->{unix_gid}:\n";
+ print GRP "wheel:x:10:
+users:x:65531:
nobody:x:65533:
nogroup:x:65534:nobody
-$ctx->{unix_name}:x:$ctx->{unix_gid}:
";
close(GRP);
my $gid_rfc2307test = 65532;
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 00146b8..6086038 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -419,7 +419,7 @@ for env in ["s3dc", "member", "plugin_s4_dc", "dc",
"s3member", "s4member"]:
nsstest4 = binpath("nsstest")
-for env in ["plugin_s4_dc", "dc", "s4member", "s3dc", "s3member", "member"]:
+for env in ["plugin_s4_dc:local", "dc:local", "s4member:local", "s3dc:local",
"s3member:local", "member:local"]:
if os.path.exists(nsstest4):
plantestsuite("samba.nss.test using winbind(%s)" % env, env,
[os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir,
"shared/libnss_wrapper_winbind.so.2")])
else:
--
Samba Shared Repository
