diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-01-31 07:08:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:44:27 -0500 |
| commit | b9f11e3bc9c0f696cce0792544afa76c07c20a2a (patch) | |
| tree | 0c882c50b52f7c18ac2a5607ae2d7aec037b497b | |
| parent | ae174faf36dbe28b24069bafe5836b6271c87e12 (diff) | |
| download | samba-b9f11e3bc9c0f696cce0792544afa76c07c20a2a.tar.gz samba-b9f11e3bc9c0f696cce0792544afa76c07c20a2a.tar.bz2 samba-b9f11e3bc9c0f696cce0792544afa76c07c20a2a.zip | |
r21071: Move some of the key path variables into the mk-keyblobs.sh script.
Andrew Bartlett
(This used to be commit 1c466c6d6f02bf76f7f68e7dcd3d9a4c2a63179a)
| -rw-r--r-- | source4/script/tests/mk-keyblobs.sh | 2 | ||||
| -rwxr-xr-x | source4/script/tests/mktestsetup.sh | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/source4/script/tests/mk-keyblobs.sh b/source4/script/tests/mk-keyblobs.sh index 8988fd1801..d05f804fae 100644 --- a/source4/script/tests/mk-keyblobs.sh +++ b/source4/script/tests/mk-keyblobs.sh @@ -11,6 +11,8 @@ REQADMIN=$TLSDIR/req-admin.der 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----- diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh index 2e6c6537a2..44abf0958f 100755 --- a/source4/script/tests/mktestsetup.sh +++ b/source4/script/tests/mktestsetup.sh @@ -58,19 +58,6 @@ PRIVATEDIR=$PREFIX_ABS/private 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 SERVER 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" |