summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@dahyabhai.net>2009-04-30 11:44:20 -0400
committerNalin Dahyabhai <nalin@dahyabhai.net>2009-04-30 11:44:20 -0400
commit3c87cd42d6098e53e81199c1a793293f7d9bcc17 (patch)
treec008bb4d4eb4ee86497262da7b07654a731bbfd1
parent6aad7045f9cce3865da825bd668af4eaecf62e73 (diff)
downloadslapi-nis-3c87cd42d6098e53e81199c1a793293f7d9bcc17.tar.gz
slapi-nis-3c87cd42d6098e53e81199c1a793293f7d9bcc17.tar.xz
slapi-nis-3c87cd42d6098e53e81199c1a793293f7d9bcc17.zip
- update dse.ldif so that it won't make 1.2.0 complain
- add a default nsslapd-rundir setting - remove the default nsslapd-ldapiautodnsuffix setting
-rw-r--r--tests/config/dse.ldif.initial.in2
-rw-r--r--tests/slapd.sh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/config/dse.ldif.initial.in b/tests/config/dse.ldif.initial.in
index d412808..dde8603 100644
--- a/tests/config/dse.ldif.initial.in
+++ b/tests/config/dse.ldif.initial.in
@@ -12,6 +12,7 @@ nsslapd-schemadir: @abs_top_srcdir@/tests/config/schema
nsslapd-certdir: @abs_top_srcdir@/tests/config
nsslapd-lockdir: @abs_top_builddir@/tests/state/lock
nsslapd-tmpdir: @abs_top_builddir@/tests/state/tmp
+nsslapd-rundir: @abs_top_builddir@/tests/state/run
nsslapd-ldifdir: @abs_top_builddir@/tests/state/ldif
nsslapd-bakdir: @abs_top_builddir@/tests/state/bak
nsslapd-instancedir: @abs_top_builddir@/tests/state
@@ -60,7 +61,6 @@ nsslapd-ldapimaptoentries: off
nsslapd-ldapiuidnumbertype: uidNumber
nsslapd-ldapigidnumbertype: gidNumber
nsslapd-ldapientrysearchbase: dc=example, dc=com
-nsslapd-ldapiautodnsuffix: cn=peercred,cn=external,cn=auth
nsslapd-security: off
dn: cn=monitor
diff --git a/tests/slapd.sh.in b/tests/slapd.sh.in
index c21e86e..ab0a5c9 100644
--- a/tests/slapd.sh.in
+++ b/tests/slapd.sh.in
@@ -55,7 +55,7 @@ startslapd() {
stopslapd
rm -rf $STATEDIR/db
local subdir=
- for subdir in bak db/userRoot ldif lock log tmp ; do
+ for subdir in bak db/userRoot ldif lock log tmp run ; do
test -d $STATEDIR/$subdir || mkdir -p $STATEDIR/$subdir
done
cat $TESTDIR/config/dse.ldif.initial > $TESTDIR/config/dse.ldif