[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Fri Jun 11 01:27:02 UTC 2021
The branch, master has been updated
via e165dcc770e selftest: Only set netbios aliases for the ad_member env
via e1d362c48d1 s3:tests: Fix passing the configuration to Smbclient_netbios_aliases test
from a602256269a s3: smbd: Cleanup - Remove #ifdef'ed out load_inherited_info().
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e165dcc770ec58c3749d653d6cb85f6ecf9479d6
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jun 10 16:20:28 2021 +0200
selftest: Only set netbios aliases for the ad_member env
The provision_ad_member() function is reused by different
setup_ad_member*() functions. Each environment needs to have unique
netbios aliases as they are all in the same network.
The aliases should only be set for the 'ad_member' environment.
Signed-Off-By: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Jun 11 01:26:36 UTC 2021 on sn-devel-184
commit e1d362c48d15d1b26992ba49069b1226fb35921d
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jun 10 12:28:44 2021 +0000
s3:tests: Fix passing the configuration to Smbclient_netbios_aliases test
Signed-Off-By: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba3.pm | 7 ++++++-
source3/script/tests/test_smbclient_netbios_aliases.sh | 9 +++++----
source3/selftest/tests.py | 3 ++-
3 files changed, 13 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 675deaf3c5a..5a30cd89fb8 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -689,11 +689,16 @@ sub provision_ad_member
$option_offline_logon = "yes";
}
+ my $netbios_aliases = "";
+ if ($machine_account eq "LOCALADMEMBER") {
+ $netbios_aliases = "netbios aliases = foo bar";
+ }
+
my $member_options = "
security = ads
workgroup = $dcvars->{DOMAIN}
realm = $dcvars->{REALM}
- netbios aliases = foo bar
+ $netbios_aliases
template homedir = /home/%D/%G/%U
auth event notification = true
password server = $dcvars->{SERVER}
diff --git a/source3/script/tests/test_smbclient_netbios_aliases.sh b/source3/script/tests/test_smbclient_netbios_aliases.sh
index 4df5cf0dfaa..47beb45a4cf 100755
--- a/source3/script/tests/test_smbclient_netbios_aliases.sh
+++ b/source3/script/tests/test_smbclient_netbios_aliases.sh
@@ -1,8 +1,8 @@
#!/bin/sh
-if [ $# -lt 1 ]; then
+if [ $# -lt 6 ]; then
cat <<EOF
-Usage: test_smbclient.sh smbclient3 SERVER USERNAME PASSWORD PREFIX <smbclient args>
+Usage: test_smbclient.sh smbclient3 SERVER USERNAME PASSWORD PREFIX CONFIGURATION
EOF
exit 1;
fi
@@ -12,8 +12,9 @@ SERVER=$2
USERNAME=$3
PASSWORD=$4
PREFIX=$5
-shift 5
-ADDARGS="$*"
+CONFIGURATION=$6
+shift 6
+ADDADS="$@"
samba_bindir="$BINDIR"
samba_srcdir="$SRCDIR/source4"
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 4b81947510e..4f82123c8f0 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -1176,7 +1176,8 @@ for options in options_list:
for alias in ["foo", "bar"]:
plantestsuite("samba3.blackbox.smbclient_netbios_aliases [%s]" % alias, "ad_member:local",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_netbios_aliases.sh"),
- smbclient3, alias, "$DC_USERNAME", "$DC_PASSWORD", "$PREFIX", options, configuration])
+ smbclient3, alias, "$DC_USERNAME", "$DC_PASSWORD", "$PREFIX",
+ configuration])
for e in endianness_options:
for a in auth_options:
--
Samba Shared Repository
More information about the samba-cvs
mailing list