added some fixes from ale for the ldap handler

re-ordered the handler list in the changelog to be alpha

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@465 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/handlers/ldap b/handlers/ldap
index ba3d78a0d0f351de1c1e42ed49581afb080de822..242755edcd8b393e2c7b639fbba9ec823d5cf453 100644 (file)
--- a/handlers/ldap
+++ b/handlers/ldap
@@ -15,7 +15,7 @@ getconf binddn
 getconf ldaphost
 getconf tls yes
 
-if [ $tls = 'yes' ] 
+if [ $tls = 'yes' ]; then
    URLBASE="ldaps"
 else
    URLBASE="ldap"
@@ -54,25 +54,13 @@ if [ "$ldif" == "yes" ]; then
       fi
       
       if [ "$method" == "slapcat" ]; then
-         if [ "$compress" == "yes" ]; then
-            execstr="$SLAPCAT -f $conf -b $dbsuffix | $GZIP"
-         else
-            execstr="$SLAPCAT -f $conf -b $dbsuffix"
-         fi
+         execstr="$SLAPCAT -f $conf -b $dbsuffix"
          debug "$execstr"
       else
-         if [ "$compress" == "yes" ]; then
-            if [ -n "$ldaphost" ]
-               execstr="$LDAPSEARCH -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile | $GZIP"
-            else
-               execstr="$LDAPSEARCH -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile | $GZIP"
-            fi
+         if [ -n "$ldaphost" ]; then
+            execstr="$LDAPSEARCH -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
          else
-            if [ -n "$ldaphost" ]
-               execstr="$LDAPSEARCH -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
-            else
-               execstr="$LDAPSEARCH -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
-            fi
+            execstr="$LDAPSEARCH -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
          fi
          [ -f "$passwordfile" ] || fatal "Password file $passwordfile not found. When method is set to ldapsearch, you must also specify a password file."
          debug "$execstr"
@@ -83,13 +71,17 @@ if [ "$ldif" == "yes" ]; then
             /etc/init.d/slapd stop
          fi
          
-         touch $dumpdir/$dbsuffix.ldif
-         if [ ! -f $dumpdir/$dbsuffix.ldif ]; then
-            fatal "Couldn't create ldif dump file: $dumpdir/$dbsuffix.ldif"
+        ext=
+        if [ "$compress" == "yes" ]; then
+           ext=".gz"
+        fi
+         touch $dumpdir/$dbsuffix.ldif$ext
+         if [ ! -f $dumpdir/$dbsuffix.ldif$ext ]; then
+            fatal "Couldn't create ldif dump file: $dumpdir/$dbsuffix.ldif$ext"
          fi
          
          if [ "$compress" == "yes" ]; then
-            output=`$execstr > $dumpdir/$dbsuffix.ldif.gz`
+            output=`$execstr | $GZIP > $dumpdir/$dbsuffix.ldif.gz`
          else
             output=`$execstr > $dumpdir/$dbsuffix.ldif`
          fi