summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-09-19 11:55:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:16 -0500
commita388d683de520f26ada240bfded2c09c067163fa (patch)
tree6a65cba636393f4e67e277f6092f0994014a37c2 /source4/script
parentcb9d4c670724d281c5de008ffa43ac30c186d6e7 (diff)
downloadsamba-a388d683de520f26ada240bfded2c09c067163fa.tar.gz
samba-a388d683de520f26ada240bfded2c09c067163fa.tar.bz2
samba-a388d683de520f26ada240bfded2c09c067163fa.zip
r10314: Apply the controvertial 'server role =' patch after discussion on the list:
This patch removes the 'domain logon' and 'domain master' controls from Samba4, in favour of a 'server role =' that users can actually understand. We can expand the list of roles as needed, and nobody has to figure out what a 'domain master' actually means. Andrew Bartlett (This used to be commit 31e755c2ced64dbd2681d5f6ef021a87dbeda689)
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/tests/selftest.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index 82cac6459f..64195f7e29 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -94,8 +94,7 @@ cat >$CONFFILE<<EOF
tls enabled = $TLS_ENABLED
panic action = $SRCDIR/script/gdb_backtrace %PID% %PROG%
wins support = yes
- domain master = yes
- domain logons = yes
+ server role = pdc
[tmp]
path = $TMPDIR
@@ -133,7 +132,7 @@ START=`date`
# give time for nbt server to register its names
echo delaying for nbt name registration
sleep 4
- bin/nmblookup -U localhost localhost
+ bin/nmblookup $CONFIGURATION -U localhost localhost
failed=0