diff options
| -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" |