svn commit: samba r21971 - in branches/SAMBA_4_0/source/script/tests: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-03-27 08:06:05 +0000 (Tue, 27 Mar 2007)
New Revision: 21971

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21971

Log:
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

Modified:
   branches/SAMBA_4_0/source/script/tests/mktestdc.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/mktestdc.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/mktestdc.sh	2007-03-27 04:21:16 UTC (rev 21970)
+++ branches/SAMBA_4_0/source/script/tests/mktestdc.sh	2007-03-27 08:06:05 UTC (rev 21971)
@@ -17,6 +17,7 @@
 	SMBD_LOGLEVEL=1
 fi
 
+SERVER_ROLE="domain controller"
 DOMAIN=SAMBADOMAIN
 USERNAME=administrator
 REALM=SAMBA.EXAMPLE.COM
@@ -86,7 +87,7 @@
 	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 @@
 
 $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 @@
  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 @@
 	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