diff options
Diffstat (limited to 'selftest')
-rwxr-xr-x | selftest/selftest.pl | 5 | ||||
-rw-r--r-- | selftest/target/Samba4.pm | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index c6eadd74dd..4ac5aeb2a4 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -714,8 +714,11 @@ my @exported_envvars = ( # nss_wrapper "NSS_WRAPPER_PASSWD", - "NSS_WRAPPER_GROUP" + "NSS_WRAPPER_GROUP", + # UID/GID for rfc2307 mapping tests + "UID_RFC2307TEST", + "GID_RFC2307TEST" ); $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index ba37504651..a08e550700 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -608,6 +608,8 @@ sub provision_raw_step1($$) # remove this again, when our smb2 client library # supports signin on compound related requests server signing = on + + idmap_ldb:use rfc2307=yes "; print CONFFILE " @@ -634,6 +636,7 @@ nobody:x:65534:65533:nobody gecos:$ctx->{prefix_abs}:/bin/false pdbtest:x:65533:65533:pdbtest gecos:$ctx->{prefix_abs}:/bin/false "; close(PWD); + my $uid_rfc2307test = 65533; open(GRP, ">$ctx->{nsswrap_group}"); print GRP " @@ -644,6 +647,7 @@ nobody:x:65533: nogroup:x:65534:nobody "; close(GRP); + my $gid_rfc2307test = 65532; my $configuration = "--configfile=$ctx->{smb_conf}"; @@ -686,7 +690,9 @@ nogroup:x:65534:nobody SAMBA_TEST_LOG => "$ctx->{prefix}/samba_test.log", SAMBA_TEST_LOG_POS => 0, NSS_WRAPPER_WINBIND_SO_PATH => Samba::nss_wrapper_winbind_so_path($self), - LOCAL_PATH => $ctx->{share} + LOCAL_PATH => $ctx->{share}, + UID_RFC2307TEST => $uid_rfc2307test, + GID_RFC2307TEST => $gid_rfc2307test }; return $ret; |