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

[abartlet at samba.org]

Author: abartlet
Date: 2007-01-31 07:08:36 +0000 (Wed, 31 Jan 2007)
New Revision: 21071

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

Log:
Move some of the key path variables into the mk-keyblobs.sh script.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/script/tests/mk-keyblobs.sh
   branches/SAMBA_4_0/source/script/tests/mktestsetup.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/mk-keyblobs.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/mk-keyblobs.sh	2007-01-31 05:38:36 UTC (rev 21070)
+++ branches/SAMBA_4_0/source/script/tests/mk-keyblobs.sh	2007-01-31 07:08:36 UTC (rev 21071)
@@ -11,6 +11,8 @@
 ADMINKEYFILE=$TLSDIR/adminkey.pem
 ADMINCERTFILE=$TLSDIR/admincert.pem
 
+mkdir -p $TLSDIR 
+
 #This is specified here to avoid draining entropy on every run
 cat >$DHFILE<<EOF 
 -----BEGIN DH PARAMETERS-----

Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/mktestsetup.sh	2007-01-31 05:38:36 UTC (rev 21070)
+++ branches/SAMBA_4_0/source/script/tests/mktestsetup.sh	2007-01-31 07:08:36 UTC (rev 21071)
@@ -58,19 +58,6 @@
 NCALRPCDIR=$PREFIX_ABS/ncalrpc
 LOCKDIR=$PREFIX_ABS/lockdir
 
-#TLS and PKINIT crypto blobs
-TLSDIR=$PRIVATEDIR/tls
-DHFILE=$TLSDIR/dhparms.pem
-CAFILE=$TLSDIR/ca.pem
-CERTFILE=$TLSDIR/cert.pem
-REQKDC=$TLSDIR/req-kdc.der
-KDCCERTFILE=$TLSDIR/kdc.pem
-KEYFILE=$TLSDIR/key.pem
-ADMINKEYFILE=$TLSDIR/adminkey.pem
-REQADMIN=$TLSDIR/req-admin.der
-ADMINKEYFILE=$TLSDIR/adminkey.pem
-ADMINCERTFILE=$TLSDIR/admincert.pem
-
 WINBINDD_SOCKET_DIR=$PREFIX_ABS/winbind_socket
 CONFIGURATION="--configfile=$CONFFILE"
 LDAPDIR=$PREFIX_ABS/ldap
@@ -83,7 +70,7 @@
 export NETBIOSNAME
 
 rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR $LDAPDIR/db $LDAPDIR/db/bdb-logs $LDAPDIR/db/tmp
+mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $LDAPDIR/db $LDAPDIR/db/bdb-logs $LDAPDIR/db/tmp
 
 if [ -z "$VALGRIND" ]; then
     nativeiconv="true"