ITS#5189

[openldap] / tests / scripts / test042-valsort

diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index 1e633e0c0859ad2042f35312ffacb15f6b75fd26..3289e3336c98606073fabfeea79ea98336e89c07 100755 (executable)
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004-2006 The OpenLDAP Foundation.
+## Copyright 2004-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -23,13 +23,8 @@ fi
 
 mkdir -p $TESTDIR $DBDIR1
 
-$SLAPPASSWD -g -n > $CONFIGPWF
-RC=$?
-if test $RC != 0 ; then
-       echo "slappasswd failed ($RC)!"
-       exit $RC
-fi
-read CONFIGPW < $CONFIGPWF
+$SLAPPASSWD -g -n >$CONFIGPWF
+echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
 echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $VALSORTCONF > $CONF1