The branch, master has been updated
via 5dccb19 selftest/Samba3: use the correct
"SELFTEST_WINBINDD_SOCKET_DIR" for "net join"
from d648775 third_party/zlib/zlib.h: use HAVE___ATTRIBUTE__ instead of
__GNUC__
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5dccb198011a93800c1e83526dd535c7b3b323a6
Author: Stefan Metzmacher <[email protected]>
Date: Tue Mar 22 14:09:08 2016 +0100
selftest/Samba3: use the correct "SELFTEST_WINBINDD_SOCKET_DIR" for "net
join"
This avoids picking up a gid from the DC's winbind when
creating BUILTIN\Administrators
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Thu Mar 24 22:15:44 CET 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
selftest/knownfail | 7 -------
selftest/target/Samba3.pm | 3 +++
2 files changed, 3 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index 83cf2d6..7e533bf 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -270,13 +270,6 @@
^samba3.local.nss.reentrant enumeration\(ad_dc:local\)
^samba3.local.nss.enumeration\(ad_dc:local\)
#
-# These fail only if we run the unix.whoami test before them
-# in the member and ad_member environments. ==> Strange!!!
-#
-^samba3.local.nss.reentrant enumeration crosschecks\(ad_member:local\)
-^samba3.local.nss.reentrant enumeration\(ad_member:local\)
-^samba3.local.nss.enumeration\(ad_member:local\)
-#
# These do not work against winbindd in member mode for unknown reasons
#
^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U against
ad_member\(ad_member:local\)
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 0b16e03..bdeebc9 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -342,6 +342,7 @@ sub setup_nt4_member($$$)
my $net = Samba::bindir_path($self, "net");
my $cmd = "";
$cmd .=
"SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
+ $cmd .=
"SELFTEST_WINBINDD_SOCKET_DIR=\"$ret->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
$cmd .= "$net join $ret->{CONFIGURATION} $nt4_dc_vars->{DOMAIN} member";
$cmd .= " -U$nt4_dc_vars->{USERNAME}\%$nt4_dc_vars->{PASSWORD}";
@@ -417,6 +418,7 @@ sub setup_admember($$$$)
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\"
";
}
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+ $cmd .=
"SELFTEST_WINBINDD_SOCKET_DIR=\"$ret->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
$cmd .= "$net join $ret->{CONFIGURATION}";
$cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
@@ -505,6 +507,7 @@ sub setup_admember_rfc2307($$$$)
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\"
";
}
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
+ $cmd .=
"SELFTEST_WINBINDD_SOCKET_DIR=\"$ret->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
$cmd .= "$net join $ret->{CONFIGURATION}";
$cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
--
Samba Shared Repository
