From fdd4c5f879c2bdfb9f15d18dd46736f7e05ec89d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 27 Mar 2007 08:06:05 +0000
Subject: r21971: Fill in some more values in config files from variables, so
 we can better setup multiple environments.

Run the mk-keyblobs script before we need variables it defines.

Andrew Bartlett
(This used to be commit 448ffc68f35f54ea9e754764311eceaf84b465da)
---
 source4/script/tests/mktestdc.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'source4/script/tests')

diff --git a/source4/script/tests/mktestdc.sh b/source4/script/tests/mktestdc.sh
index da12857479..234a1dcdb9 100755
--- a/source4/script/tests/mktestdc.sh
+++ b/source4/script/tests/mktestdc.sh
@@ -17,6 +17,7 @@ if test -z "$SMBD_LOGLEVEL"; then
 	SMBD_LOGLEVEL=1
 fi
 
+SERVER_ROLE="domain controller"
 DOMAIN=SAMBADOMAIN
 USERNAME=administrator
 REALM=SAMBA.EXAMPLE.COM
@@ -86,7 +87,7 @@ cat >$CONFFILE<<EOF
 	tls dh params file = $DHFILE
 	panic action = $SRCDIR/script/gdb_backtrace %PID% %PROG%
 	wins support = yes
-	server role = domain controller
+	server role = $SERVER_ROLE
 	max xmit = 32K
 	server max protocol = SMB2
 	notify:inotify = false
@@ -203,9 +204,13 @@ EOF
 
 $srcdir/bin/ldbadd -H $PRIVATEDIR/share.ldb < $PRIVATEDIR/share.ldif >/dev/null || exit 1
 
+. `dirname $0`/mk-keyblobs.sh
+
 cat >$KRB5_CONFIG<<EOF
+#Generated krb5.conf for $REALM
+
 [libdefaults]
- default_realm = SAMBA.EXAMPLE.COM
+ default_realm = $REALM
  dns_lookup_realm = false
  dns_lookup_kdc = false
  ticket_lifetime = 24h
@@ -215,7 +220,7 @@ cat >$KRB5_CONFIG<<EOF
  SAMBA.EXAMPLE.COM = {
   kdc = 127.0.0.1:88
   admin_server = 127.0.0.1:88
-  default_domain = samba.example.com
+  default_domain = $DNSNAME
  }
 
 [appdefaults]
@@ -227,11 +232,9 @@ cat >$KRB5_CONFIG<<EOF
 	pkinit_anchors = FILE:$CAFILE
 
 [domain_realm]
- .samba.example.com = SAMBA.EXAMPLE.COM
+ .$DNSNAME = $REALM
 EOF
 
-. `dirname $0`/mk-keyblobs.sh
-
 #Ensure the config file is valid before we start
 $srcdir/bin/testparm $CONFIGURATION -v --suppress-prompt >/dev/null 2>&1 || {
     echo "">&2
-- 
cgit