From 19a17982c6efb458cec261bfd885bdc712d2ccf1 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 20 Jan 1999 05:43:33 +0000
Subject: [PATCH] suffixes need to be stored in normalized uppercase format
---
servers/slapd/config.c | 2 +-
tests/scripts/defines.sh | 1 +
tests/scripts/test001-ldif2ldbm | 2 +-
tests/scripts/test001-slapadd | 2 +-
tests/scripts/test002-populate | 2 +-
tests/scripts/test003-search | 2 +-
tests/scripts/test004-modify | 2 +-
tests/scripts/test006-acls | 2 +-
tests/scripts/test007-replication | 4 ++--
9 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 2b726078de..77ea816731 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -129,7 +129,7 @@ read_config( char *fname, Backend **bep, FILE *pfp )
fname, lineno, 0 );
} else {
char *dn = ch_strdup( cargv[1] );
- (void) dn_normalize( dn );
+ (void) dn_normalize_case( dn );
charray_add( &be->be_suffix, dn );
}
diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index f16d201317..49a6656fb7 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -6,6 +6,7 @@ SLURPD=../servers/slurpd/slurpd
LDAPSEARCH=../clients/tools/ldapsearch
LDAPMODIFY=../clients/tools/ldapmodify
LDAPADD=../clients/tools/ldapadd
+LVL=5
PORT=9009
SLAVEPORT=9010
DBDIR=./test-db
diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index 49f00671b1..64deb66b87 100755
--- a/tests/scripts/test001-ldif2ldbm
+++ b/tests/scripts/test001-ldif2ldbm
@@ -25,7 +25,7 @@ if [ $RC != 0 ]; then
fi
echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
PID=$!
echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 49f00671b1..64deb66b87 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -25,7 +25,7 @@ if [ $RC != 0 ]; then
fi
echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
PID=$!
echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index d5f659b71d..cc7fc7debd 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -13,7 +13,7 @@ echo "Cleaning up in $DBDIR..."
rm -f $DBDIR/[!C]*
echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
PID=$!
echo "Using ldapsearch to check that slapd is running..."
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 661ccc219f..e6d2d6ac9d 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -21,7 +21,7 @@ if [ $RC != 0 ]; then
fi
echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
PID=$!
echo "Testing slapd searching..."
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 46d813e7e7..bea606e7a3 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -21,7 +21,7 @@ if [ $RC != 0 ]; then
fi
echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
PID=$!
echo "Testing slapd modify operations..."
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 6979cf27fa..7a1f0f84f5 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -21,7 +21,7 @@ if [ $RC != 0 ]; then
fi
echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $ACLCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $ACLCONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
PID=$!
echo "Testing slapd access control..."
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 58bcfec0a1..472d257678 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -30,11 +30,11 @@ echo "Cleaning up in $REPLDIR..."
rm -f $REPLDIR/[!C]*
echo "Starting master slapd on TCP/IP port $PORT..."
-$SLAPD -f $MASTERCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $MASTERCONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
PID=$!
echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
-$SLAPD -f $SLAVECONF -p $SLAVEPORT -d 1 > $SLAVELOG 2>&1 &
+$SLAPD -f $SLAVECONF -p $SLAVEPORT -d $LVL > $SLAVELOG 2>&1 &
SLAVEPID=$!
echo "Using ldapsearch to check that master slapd is running..."
--
GitLab