set hostname via a variable, may need tweaking in some environments

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 96a7c13d4f95c151fbbea2825eabc9e730178e66..925d621a7be0a9fe36b903410f9a7f56efb132a3 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -52,11 +52,11 @@ LDAPADD="$CLIENTDIR/ldapadd $TOOLPROTO $TOOLARGS"
 LDAPMODRDN="$CLIENTDIR/ldapmodrdn $TOOLPROTO $TOOLARGS"
 SLAPDTESTER=$PROGDIR/slapd-tester
 LVL=${SLAPD_DEBUG-5}
 LDAPMODRDN="$CLIENTDIR/ldapmodrdn $TOOLPROTO $TOOLARGS"
 SLAPDTESTER=$PROGDIR/slapd-tester
 LVL=${SLAPD_DEBUG-5}

-ADDR=127.0.0.1
+LOCALHOST=localhost

 PORT=9009
 SLAVEPORT=9010
 PORT=9009
 SLAVEPORT=9010

-MASTERURI="ldap://localhost:$PORT/"
-SLAVEURI="ldap://localhost:$SLAVEPORT/"
+MASTERURI="ldap://${LOCALHOST}:$PORT/"
+SLAVEURI="ldap://${LOCALHOST}:$SLAVEPORT/"

 LDIF=$DATADIR/test.ldif
 LDIFGLUED=$DATADIR/test-glued.ldif
 LDIFORDERED=$DATADIR/test-ordered.ldif
 LDIF=$DATADIR/test.ldif
 LDIFGLUED=$DATADIR/test-glued.ldif
 LDIFORDERED=$DATADIR/test-ordered.ldif

diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search
index 22b940f090d0a5e47e0f98362f63b263b105c388..ba6fedb80e653ce7a0752ff0cd56af606284e6cf 100755 (executable)
--- a/tests/scripts/passwd-search
+++ b/tests/scripts/passwd-search
@@ -23,7 +23,7 @@ PID=$!
 
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
 
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -L -b "$BASEDN" -h localhost -p $PORT \
+       $LDAPSEARCH -L -b "$BASEDN" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -41,7 +41,7 @@ fi
 cat /dev/null > $TESTOUT
 
 echo "Testing base suffix searching..."
 cat /dev/null > $TESTOUT
 
 echo "Testing base suffix searching..."

-$LDAPSEARCH -L -S "" -b "$BASEDN" -s base -h localhost -p $PORT \
+$LDAPSEARCH -L -S "" -b "$BASEDN" -s base -h $LOCALHOST -p $PORT \

        '(objectclass=*)' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
        '(objectclass=*)' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"


@@ -52,7 +52,7 @@ fi
 echo " ------------ " >> $TESTOUT
 
 echo "Testing user searching..."
 echo " ------------ " >> $TESTOUT
 
 echo "Testing user searching..."

-$LDAPSEARCH -L -S "" -b "uid=root,$BASEDN" -s base -h localhost -p $PORT \
+$LDAPSEARCH -L -S "" -b "uid=root,$BASEDN" -s base -h $LOCALHOST -p $PORT \

        '(objectclass=*)' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
        '(objectclass=*)' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"


@@ -63,7 +63,7 @@ fi
 echo " ------------ " >> $TESTOUT
 
 echo "Testing exact searching..."
 echo " ------------ " >> $TESTOUT
 
 echo "Testing exact searching..."

-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        '(uid=root)' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
        '(uid=root)' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"


@@ -74,7 +74,7 @@ fi
 echo " ------------ " >> $TESTOUT
 
 echo "Testing OR searching..."
 echo " ------------ " >> $TESTOUT
 
 echo "Testing OR searching..."

-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        '(|(objectclass=person)(cn=root))' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
        '(|(objectclass=person)(cn=root))' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"


@@ -85,7 +85,7 @@ fi
 echo " ------------ " >> $TESTOUT
 
 echo "Testing AND searching..."
 echo " ------------ " >> $TESTOUT
 
 echo "Testing AND searching..."

-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -L -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        '(&(objectclass=person)(cn=root))' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
        '(&(objectclass=person)(cn=root))' >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed!"

diff --git a/tests/scripts/start-master b/tests/scripts/start-master
index f527c432b897dabf2a4624c99328e65f6482fc59..bbad878074ff960e28e5f94fb960b03fd887df6b 100755 (executable)
--- a/tests/scripts/start-master
+++ b/tests/scripts/start-master
@@ -35,7 +35,7 @@ PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -S "" -b "$BASEDN" -h localhost:$PORT > $SEARCHOUT 2>&1
+       $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT > $SEARCHOUT 2>&1

        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."
        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."

diff --git a/tests/scripts/start-master-nolog b/tests/scripts/start-master-nolog
index 60553216076ba2320611024a3098d4b818dd9dfb..0dedcb752ac208e905b6e3422b7e3a63f32788b9 100755 (executable)
--- a/tests/scripts/start-master-nolog
+++ b/tests/scripts/start-master-nolog
@@ -35,7 +35,7 @@ PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -S "" -b "$BASEDN" -h localhost:$PORT > $SEARCHOUT 2>&1
+       $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT > $SEARCHOUT 2>&1

        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."
        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 205c1b5440fc00689afd4c6317553ee3a8f0c273..1264e08d156e432a4be63d93def64c7f6b6cac07 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -35,7 +35,7 @@ fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -b "" -s base -h localhost:$PORT 'extensibleObject' > $SEARCHOUT 2>&1
+       $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT 'extensibleObject' > $SEARCHOUT 2>&1

        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."
        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index a839be1c4f060712f9915cb0a3ed617e310433bd..dc72b933022419e2e74332ee52b4bcdd71a5bce2 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -43,7 +43,7 @@ fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -S "" -b "$BASEDN" -h localhost:$PORT > $SEARCHOUT 2>&1
+       $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT > $SEARCHOUT 2>&1

        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."
        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 9318b65205bcb30caf6da1e285c82a798db6fd7a..81ad49508a272db3ea401bf784de643faf4ea511 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -32,7 +32,7 @@ fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -42,7 +42,7 @@ for i in 0 1 2 3 4 5; do
 done
 
 echo "Using ldapadd to populate the database..."
 done
 
 echo "Using ldapadd to populate the database..."

-$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \

        $LDIFORDERED > $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        $LDIFORDERED > $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -52,7 +52,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to read all the entries..."
 fi
 
 echo "Using ldapsearch to read all the entries..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        'objectclass=*' > $SEARCHOUT 2>&1
 
 kill -HUP $PID
        'objectclass=*' > $SEARCHOUT 2>&1
 
 kill -HUP $PID

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 28152ee4ad0160e5aad6a989ecf6da99b163cd98..9ecd57a071f2067969b8214a81357f9a8f532a0e 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -49,7 +49,7 @@ fi
 
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
 
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -67,7 +67,7 @@ fi
 cat /dev/null > $SEARCHOUT
 
 echo "Testing exact searching..."
 cat /dev/null > $SEARCHOUT
 
 echo "Testing exact searching..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        'sn=jensen' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        'sn=jensen' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"


@@ -76,7 +76,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing OR searching..."
 fi
 
 echo "Testing OR searching..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        '(|(undefined=fubar)(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        '(|(undefined=fubar)(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"


@@ -85,7 +85,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing AND matching and ends-with searching..."
 fi
 
 echo "Testing AND matching and ends-with searching..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"


@@ -94,7 +94,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing NOT searching..."
 fi
 
 echo "Testing NOT searching..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        '(!(objectclass=person))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        '(!(objectclass=person))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 2e110dd7679abfc5536a037de7855e64dc462881..bcf78dde4432c195ac2344fc250cda4248cea668 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -43,7 +43,7 @@ fi
 
 echo "Testing slapd modify operations..."
 for i in 0 1 2 3 4 5; do
 
 echo "Testing slapd modify operations..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -59,7 +59,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing modify, add, and delete..."
 fi
 
 echo "Testing modify, add, and delete..."

-$LDAPMODIFY -v -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD > \
+$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD > \

        $TESTOUT 2>&1 << EOMODS
 version: 1
 
        $TESTOUT 2>&1 << EOMODS
 version: 1
 


@@ -131,7 +131,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 fi
 
 echo "Using ldapsearch to retrieve all the entries..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?
 kill -HUP $PID
            'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?
 kill -HUP $PID

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 66a1b9f271ee9e9abbbff8e8a521c803e5d98889..967bb2cf19cce7ecad6e6e981c54d5fe6688331c 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -41,7 +41,7 @@ echo "Testing slapd modrdn operations..."
 
 # Make sure we can search the database
 for i in 0 1 2 3 4 5; do
 
 # Make sure we can search the database
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+       $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'objectClass=*' > $INITOUT 2>&1
        RC=$?
        if test $RC = 1 ; then
            'objectClass=*' > $INITOUT 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -59,7 +59,7 @@ fi
 # -r used to do remove of old rdn
 
 echo "Testing modrdn(deleteoldrdn=0)..."
 # -r used to do remove of old rdn
 
 echo "Testing modrdn(deleteoldrdn=0)..."

-$LDAPMODRDN -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD > \
+$LDAPMODRDN -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD > \

        $TESTOUT 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones III'
 
 RC=$?
        $TESTOUT 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones III'
 
 RC=$?


@@ -70,7 +70,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing modrdn(deleteoldrdn=1)..."
 fi
 
 echo "Testing modrdn(deleteoldrdn=1)..."

-$LDAPMODRDN -D "$MANAGERDN" -r -h localhost -p $PORT -w $PASSWD >> \
+$LDAPMODRDN -D "$MANAGERDN" -r -h $LOCALHOST -p $PORT -w $PASSWD >> \

        $TESTOUT 2>&1 'cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US' 'cn=James A Jones II'
 
 RC=$?
        $TESTOUT 2>&1 'cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US' 'cn=James A Jones II'
 
 RC=$?


@@ -83,7 +83,7 @@ fi
 # Ensure the new rdn's can be found
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones III)..."
 # Ensure the new rdn's can be found
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones III)..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'cn=James A Jones III' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
            'cn=James A Jones III' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -110,7 +110,7 @@ fi
 
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones II)..."
 
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones II)..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'cn=James A Jones II' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
            'cn=James A Jones II' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -139,7 +139,7 @@ fi
 # an attribute.
 
 echo "Using ldapsearch to retrieve entries using removed rdn (cn=James A Jones 2)..."
 # an attribute.
 
 echo "Using ldapsearch to retrieve entries using removed rdn (cn=James A Jones 2)..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'cn=James A Jones 2' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
            'cn=James A Jones 2' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -155,7 +155,7 @@ if test $? != 0 ; then
 fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 fi
 
 echo "Using ldapsearch to retrieve all the entries..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
            'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -181,7 +181,7 @@ fi
 
 
 echo "Testing modrdn(deleteoldrdn=1), modrdn with new rdn already an att val..."
 
 
 echo "Testing modrdn(deleteoldrdn=1), modrdn with new rdn already an att val..."

-$LDAPMODRDN -D "$MANAGERDN" -r -h localhost -p $PORT -w $PASSWD > \
+$LDAPMODRDN -D "$MANAGERDN" -r -h $LOCALHOST -p $PORT -w $PASSWD > \

        /dev/null 2>&1 'cn=James A Jones III, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones 1'
 
 RC=$?
        /dev/null 2>&1 'cn=James A Jones III, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones 1'
 
 RC=$?


@@ -195,7 +195,7 @@ fi
 # present
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones 1)..."
 # present
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones 1)..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'cn=James A Jones 1' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
            'cn=James A Jones 1' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index c7e1f1869773ffd1d55961afb6d7539bf62e3731..0f0d89993aa9d73f9c98e6e6a42810096ba99929 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -40,7 +40,7 @@ fi
 
 echo "Testing slapd access control..."
 for i in 0 1 2 3 4 5; do
 
 echo "Testing slapd access control..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -62,10 +62,10 @@ cat /dev/null > $SEARCHOUT
 # give us nothing if we're not bound, and should return all attributes
 # if we're bound as anyone under UM.
 #
 # give us nothing if we're not bound, and should return all attributes
 # if we're bound as anyone under UM.
 #

-$LDAPSEARCH -b "$JAJDN" -h localhost -p $PORT "objectclass=*" \
+$LDAPSEARCH -b "$JAJDN" -h $LOCALHOST -p $PORT "objectclass=*" \

        >> $SEARCHOUT 2>&1
 
        >> $SEARCHOUT 2>&1
 

-$LDAPSEARCH -b "$JAJDN" -h localhost -p $PORT \
+$LDAPSEARCH -b "$JAJDN" -h $LOCALHOST -p $PORT \

        -D "$BABSDN" -w bjensen "objectclass=*"  >> $SEARCHOUT 2>&1
 
 
        -D "$BABSDN" -w bjensen "objectclass=*"  >> $SEARCHOUT 2>&1
 
 


@@ -74,7 +74,7 @@ $LDAPSEARCH -b "$JAJDN" -h localhost -p $PORT \
 # fail when we add some DN other than our own, and should succeed when
 # we add our own DN.
 # bjensen
 # fail when we add some DN other than our own, and should succeed when
 # we add our own DN.
 # bjensen

-$LDAPMODIFY -D "$JAJDN" -h localhost -p $PORT -w jaj > \
+$LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT -w jaj > \

        $TESTOUT 2>&1 << EOMODS1
 version: 1
 dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US
        $TESTOUT 2>&1 << EOMODS1
 version: 1
 dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US


@@ -84,7 +84,7 @@ member: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univ
 
 EOMODS1
 
 
 EOMODS1
 

-$LDAPMODIFY -D "$JAJDN" -h localhost -p $PORT -w jaj >> \
+$LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT -w jaj >> \

        $TESTOUT 2>&1 << EOMODS2
 version: 1
 
        $TESTOUT 2>&1 << EOMODS2
 version: 1
 


@@ -99,7 +99,7 @@ EOMODS2
 # 1) bound as "James A Jones 1" - should fail
 # 2) bound as "Barbara Jensen" - should succeed
 #
 # 1) bound as "James A Jones 1" - should fail
 # 2) bound as "Barbara Jensen" - should succeed
 #

-$LDAPMODIFY -D "$JAJDN" -h localhost -p $PORT -w jaj >> \
+$LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT -w jaj >> \

        $TESTOUT 2>&1 << EOMODS3
 
 dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US
        $TESTOUT 2>&1 << EOMODS3
 
 dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US


@@ -108,7 +108,7 @@ delete: member
 
 EOMODS3
 
 
 EOMODS3
 

-$LDAPMODIFY -D "$BJORNSDN" -h localhost -p $PORT -w bjorn >> \
+$LDAPMODIFY -D "$BJORNSDN" -h $LOCALHOST -p $PORT -w bjorn >> \

        $TESTOUT 2>&1 << EOMODS4
 # COMMENT
 version: 1
        $TESTOUT 2>&1 << EOMODS4
 # COMMENT
 version: 1


@@ -124,7 +124,7 @@ ou: Groups
 EOMODS4
 
 echo "Using ldapsearch to retrieve all the entries..."
 EOMODS4
 
 echo "Using ldapsearch to retrieve all the entries..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

            'objectClass=*' | . $LDIFFILTER >> $SEARCHOUT 2>&1
 RC=$?
 kill -HUP $PID
            'objectClass=*' | . $LDIFFILTER >> $SEARCHOUT 2>&1
 RC=$?
 kill -HUP $PID

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 000cb22331b23292bf18943a70778e5f29c2cce5..a0d9d49bb5cb4d2e7a8a42f67d7d7d1c604b79f7 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -58,7 +58,7 @@ fi
 
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -69,7 +69,7 @@ done
 
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -83,7 +83,7 @@ $SLURPD -f $MASTERCONF -d ${SLURPD_DEBUG-5} -t $REPLDIR > $SLURPLOG 2>&1 &
 SLURPPID=$!
 
 echo "Using ldapadd to populate the master directory..."
 SLURPPID=$!
 
 echo "Using ldapadd to populate the master directory..."

-$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \

        $LDIFORDERED > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
        $LDIFORDERED > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -102,7 +102,7 @@ echo "Using ldapmodify to modify master directory..."
 # Do some modifications
 #
 
 # Do some modifications
 #
 

-$LDAPMODIFY -v -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD > \
+$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD > \

        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US
 changetype: modify
        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US
 changetype: modify


@@ -175,7 +175,7 @@ echo "Waiting 15 seconds for slurpd to send changes..."
 sleep 15
 
 echo "Using ldapsearch to read all the entries from the master..."
 sleep 15
 
 echo "Using ldapsearch to read all the entries from the master..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        'objectclass=*' > $MASTEROUT 2>&1
 
 if test $RC != 0 ; then
        'objectclass=*' > $MASTEROUT 2>&1
 
 if test $RC != 0 ; then


@@ -186,7 +186,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to read all the entries from the slave..."
 fi
 
 echo "Using ldapsearch to read all the entries from the slave..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $SLAVEPORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $SLAVEPORT \

        'objectclass=*' > $SLAVEOUT 2>&1
 
 if test $RC != 0 ; then
        'objectclass=*' > $SLAVEOUT 2>&1
 
 if test $RC != 0 ; then

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index a4847f0527ef8fb14671bb83f8f0dc4efe2d06a9..fef0896355a54408c805494bb85e65644ce711b8 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -45,7 +45,7 @@ fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -55,7 +55,7 @@ for i in 0 1 2 3 4 5; do
 done
 
 echo "Using tester for concurrent server access..."
 done
 
 echo "Using tester for concurrent server access..."

-$SLAPDTESTER -b "$BASEDN" -P "$PROGDIR" -d "$DATADIR" -h localhost -p $PORT -D "$MANAGERDN" -w $PASSWD -l 50
+$SLAPDTESTER -b "$BASEDN" -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT -D "$MANAGERDN" -w $PASSWD -l 50

 RC=$?
 
 if test $RC != 0 ; then
 RC=$?
 
 if test $RC != 0 ; then


@@ -64,7 +64,7 @@ if test $RC != 0 ; then
 fi 
 
 echo "Using ldapsearch to retrieve all the entries..."
 fi 
 
 echo "Using ldapsearch to retrieve all the entries..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

                        'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?
 
                        'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?
 

diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 7f93c039de24f3eddb43b5e2075bc17f69cb06aa..d5fee104149f1a28830f9c207047079102f37f47 100755 (executable)
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -55,7 +55,7 @@ fi
 
 echo "Testing for master slapd..."
 for i in 0 1 2 3 4 5; do
 
 echo "Testing for master slapd..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -72,7 +72,7 @@ fi
 
 echo "Testing for slave slapd..."
 for i in 0 1 2 3 4 5; do
 
 echo "Testing for slave slapd..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $SLAVEPORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $SLAVEPORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -84,7 +84,7 @@ done
 cat /dev/null > $SEARCHOUT
 
 echo "Testing exact searching..."
 cat /dev/null > $SEARCHOUT
 
 echo "Testing exact searching..."

-$LDAPSEARCH -C -S "" -b "$BASEDN" -h localhost -p $SLAVEPORT \
+$LDAPSEARCH -C -S "" -b "$BASEDN" -h $LOCALHOST -p $SLAVEPORT \

        'sn=jensen' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        'sn=jensen' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"


@@ -93,7 +93,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing OR searching..."
 fi
 
 echo "Testing OR searching..."

-$LDAPSEARCH -C -S "" -b "$BASEDN" -h localhost -p $SLAVEPORT \
+$LDAPSEARCH -C -S "" -b "$BASEDN" -h $LOCALHOST -p $SLAVEPORT \

        '(|(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        '(|(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"


@@ -102,7 +102,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing AND matching and ends-with searching..."
 fi
 
 echo "Testing AND matching and ends-with searching..."

-$LDAPSEARCH -C -S "" -b "$BASEDN" -h localhost -p $SLAVEPORT \
+$LDAPSEARCH -C -S "" -b "$BASEDN" -h $LOCALHOST -p $SLAVEPORT \

        '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"


@@ -111,7 +111,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing NOT searching..."
 fi
 
 echo "Testing NOT searching..."

-$LDAPSEARCH -C -S "" -b "$BASEDN" -h localhost -p $SLAVEPORT \
+$LDAPSEARCH -C -S "" -b "$BASEDN" -h $LOCALHOST -p $SLAVEPORT \

        '(!(objectclass=person))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        '(!(objectclass=person))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"

diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index c8753983cade73373a17e538338f8ce057cdc39e..8492d96ee621aa39180f6917494f4b2bcff0aced 100755 (executable)
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -32,7 +32,7 @@ fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -42,7 +42,7 @@ for i in 0 1 2 3 4 5; do
 done
 
 echo "Using ldapadd to populate the database..."
 done
 
 echo "Using ldapadd to populate the database..."

-$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \

        $LDIFPASSWD > $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        $LDIFPASSWD > $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -56,14 +56,14 @@ echo > $TESTOUT
 
 echo "Using ldapsearch to verify population ..."
 echo "++ Initial search" >> $SEARCHOUT
 
 echo "Using ldapsearch to verify population ..."
 echo "++ Initial search" >> $SEARCHOUT

-$LDAPSEARCH -h localhost -p $PORT \
+$LDAPSEARCH -h $LOCALHOST -p $PORT \

        -D "$MANAGERDN" -w $PASSWD \
        -b "$BASEDN" \
        'objectclass=*' >> $SEARCHOUT 2>&1
 
 echo "Using ldappasswd (PASS 1)  ..."
 echo "Pass 1" >> $TESTOUT
        -D "$MANAGERDN" -w $PASSWD \
        -b "$BASEDN" \
        'objectclass=*' >> $SEARCHOUT 2>&1
 
 echo "Using ldappasswd (PASS 1)  ..."
 echo "Pass 1" >> $TESTOUT

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w secret -s newsecret \
        -D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
 RC=$?
        -w secret -s newsecret \
        -D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
 RC=$?


@@ -72,7 +72,7 @@ if test $RC != 0 ; then
        kill -HUP $PID
        exit $RC
 fi
        kill -HUP $PID
        exit $RC
 fi

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w $PASSWD -s newsecret \
        -D $MANAGERDN "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        -w $PASSWD -s newsecret \
        -D $MANAGERDN "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then


@@ -80,7 +80,7 @@ if test $RC != 0 ; then
        kill -HUP $PID
        exit $RC
 fi
        kill -HUP $PID
        exit $RC
 fi

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w secret -s newsecret \
        -D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        -w secret -s newsecret \
        -D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then


@@ -88,7 +88,7 @@ if test $RC != 0 ; then
        kill -HUP $PID
        exit $RC
 fi
        kill -HUP $PID
        exit $RC
 fi

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w secret -s newsecret \
        -D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        -w secret -s newsecret \
        -D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then


@@ -100,7 +100,7 @@ fi
 echo "" >> $TESTOUT
 echo "Pass 2" >> $TESTOUT
 echo "Using ldappasswd (PASS 2)  ..."
 echo "" >> $TESTOUT
 echo "Pass 2" >> $TESTOUT
 echo "Using ldappasswd (PASS 2)  ..."

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w newsecret \
        -D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        -w newsecret \
        -D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then


@@ -108,7 +108,7 @@ if test $RC != 0 ; then
        kill -HUP $PID
        exit $RC
 fi
        kill -HUP $PID
        exit $RC
 fi

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w newsecret \
        -D "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        -w newsecret \
        -D "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then


@@ -116,7 +116,7 @@ if test $RC != 0 ; then
        kill -HUP $PID
        exit $RC
 fi
        kill -HUP $PID
        exit $RC
 fi

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w newsecret \
        -D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        -w newsecret \
        -D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then


@@ -124,7 +124,7 @@ if test $RC != 0 ; then
        kill -HUP $PID
        exit $RC
 fi
        kill -HUP $PID
        exit $RC
 fi

-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT \

        -w newsecret \
        -D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
        -w newsecret \
        -D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then

diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl
index e7f9d8e8795d1a3bd5a64020ad2feee76bcfa05a..c7fbc1c7ccc4a55b18ab629d148dee43044ac813 100755 (executable)
--- a/tests/scripts/test011-subtree-repl
+++ b/tests/scripts/test011-subtree-repl
@@ -60,7 +60,7 @@ fi
 
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -71,7 +71,7 @@ done
 
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -85,7 +85,7 @@ $SLURPD -f $SUBMASTERCONF -d ${SLURPD_DEBUG-5} -t $REPLDIR > $SLURPLOG 2>&1 &
 SLURPPID=$!
 
 echo "Using ldapadd to populate the master directory..."
 SLURPPID=$!
 
 echo "Using ldapadd to populate the master directory..."

-$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \

        $LDIFORDERED > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
        $LDIFORDERED > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -104,7 +104,7 @@ echo "Using ldapmodify to modify master directory..."
 # Do some modifications
 #
 
 # Do some modifications
 #
 

-$LDAPMODIFY -v -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD > \
+$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD > \

        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US
 changetype: modify
        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US
 changetype: modify


@@ -177,7 +177,7 @@ echo "Waiting 15 seconds for slurpd to send changes..."
 sleep 15
 
 echo "Using ldapsearch to read all the entries from the master..."
 sleep 15
 
 echo "Using ldapsearch to read all the entries from the master..."

-$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \

        'objectclass=*' > $MASTEROUT 2>&1
 
 if test $RC != 0 ; then
        'objectclass=*' > $MASTEROUT 2>&1
 
 if test $RC != 0 ; then


@@ -188,7 +188,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to read the subtree entries from the master..."
 fi
 
 echo "Using ldapsearch to read the subtree entries from the master..."

-$LDAPSEARCH -S "" -b "ou=Groups, $BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "ou=Groups, $BASEDN" -h $LOCALHOST -p $PORT \

        'objectclass=*' > $SUBMASTEROUT 2>&1
 
 if test $RC != 0 ; then
        'objectclass=*' > $SUBMASTEROUT 2>&1
 
 if test $RC != 0 ; then


@@ -199,7 +199,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to read all the entries from the slave..."
 fi
 
 echo "Using ldapsearch to read all the entries from the slave..."

-$LDAPSEARCH -S "" -b "ou=Groups, $BASEDN" -h localhost -p $SLAVEPORT \
+$LDAPSEARCH -S "" -b "ou=Groups, $BASEDN" -h $LOCALHOST -p $SLAVEPORT \

        'objectclass=*' > $SLAVEOUT 2>&1
 
 if test $RC != 0 ; then
        'objectclass=*' > $SLAVEOUT 2>&1
 
 if test $RC != 0 ; then

diff --git a/tests/scripts/test012-glue b/tests/scripts/test012-glue
index b6bbcb7276ca6f3983ced555d3e3bb720f8f69c5..7012c131d031ae8e9e29a76de7115a53c87884a1 100755 (executable)
--- a/tests/scripts/test012-glue
+++ b/tests/scripts/test012-glue
@@ -43,7 +43,7 @@ fi
 echo "Using ldapsearch to retrieve all the entries..."
 cd test-db
 for i in 0 1 2 3 4 5; do
 echo "Using ldapsearch to retrieve all the entries..."
 cd test-db
 for i in 0 1 2 3 4 5; do

-       ../$LDAPSEARCH -b "$BASEDN" -h localhost:$PORT > ../$SEARCHOUT 2>&1
+       ../$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT > ../$SEARCHOUT 2>&1

        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."
        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."


@@ -87,7 +87,7 @@ fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do

-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \

                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then
                'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 1 ; then


@@ -97,7 +97,7 @@ for i in 0 1 2 3 4 5; do
 done
 
 echo "Using ldapadd to populate the glued database..."
 done
 
 echo "Using ldapadd to populate the glued database..."

-$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \

        $LDIFORDERED > $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        $LDIFORDERED > $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then


@@ -107,7 +107,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to read all the entries..."
 fi
 
 echo "Using ldapsearch to read all the entries..."

-$LDAPSEARCH -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT \

        'objectclass=*' > $SEARCHOUT 2>&1
 
 kill -HUP $PID
        'objectclass=*' > $SEARCHOUT 2>&1
 
 kill -HUP $PID