X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fldap.in;h=f6f87c77a46ce83eba218aa0d87c09cb29555e75;hb=f5135253a376e2629eb43bacc0f52a53e5050c67;hp=5f9040a32ebe056f3f3c24050aa4ada9ab2a2d5f;hpb=2bca513c38c70cd7a56bef23512183629e91bade;p=matthijs%2Fupstream%2Fbackupninja-vserver.git diff --git a/handlers/ldap.in b/handlers/ldap.in index 5f9040a..f6f87c7 100644 --- a/handlers/ldap.in +++ b/handlers/ldap.in @@ -42,7 +42,7 @@ if [ "$ldif" == "yes" ]; then fi for db in $databases; do - if [ `expr index "$dbnum" "="` == "0" ]; then + if [ `expr index "$db" "="` == "0" ]; then # db is a number, get the suffix. dbsuffix=${dbsuffixes[$db]/*:/} else @@ -55,7 +55,6 @@ if [ "$ldif" == "yes" ]; then if [ "$method" == "slapcat" ]; then execstr="$SLAPCAT -f $conf -b $dbsuffix" - debug "$execstr" else if [ -n "$ldaphost" ]; then execstr="$LDAPSEARCH -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile" @@ -81,10 +80,12 @@ if [ "$ldif" == "yes" ]; then fi if [ "$compress" == "yes" ]; then - output=`$execstr | $GZIP > $dumpdir/$dbsuffix.ldif.gz` + execstr="$execstr | $GZIP > $dumpdir/$dbsuffix.ldif.gz" else - output=`$execstr > $dumpdir/$dbsuffix.ldif` + execstr="$execstr > $dumpdir/$dbsuffix.ldif" fi + debug "$execstr" + output=`su root -c "$execstr" 2>&1` code=$? if [ "$code" == "0" ]; then debug $output