improved error message if password file not found

moved start/stop ldap code so that it makes sense.

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

diff --git a/handlers/ldap b/handlers/ldap
index e7895190e54cc9c5011dcaf45fad8f95222588e2..3bc01d4fbcd8b0ab6a65eeba4baee27de044cf8d 100644 (file)
--- a/handlers/ldap
+++ b/handlers/ldap
@@ -46,21 +46,17 @@ if [ "$ldif" == "yes" ]; then
 
                if [ "$method" == "slapcat" ]; then
                        execstr="$SLAPCAT -f $conf -b $dbsuffix"
-                       if [ "$restart" == "yes" ]; then
-                               debug "Shutting down ldap server..."
-                               /etc/init.d/slapd stop
-                       fi
                        debug "$execstr"
                else
                        execstr="$LDAPSEARCH -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile"
-                       [ -f "$passwordfile" ] || fatal "Password file $passwordfile not found"
+                       [ -f "$passwordfile" ] || fatal "Password file $passwordfile not found. When method is set to ldapsearch, you must also specify a password file."
+                       debug "$execstr"
+               fi
+               if [ ! $test ]; then
                        if [ "$restart" == "yes" ]; then
                                debug "Shutting down ldap server..."
                                /etc/init.d/slapd stop
                        fi
-                       debug "$execstr"
-               fi
-               if [ ! $test ]; then
 
                        touch $dumpdir/$dbsuffix.ldif
                        if [ ! -f $dumpdir/$dbsuffix.ldif ]; then
@@ -72,10 +68,6 @@ if [ "$ldif" == "yes" ]; then
                        if [ "$code" == "0" ]; then
                                debug $output
                                info "Successfully finished ldif export of $dbsuffix"
-                               if [ "$restart" == "yes" ]; then
-                                       debug "Starting ldap server..."
-                                       /etc/init.d/slapd start
-                               fi
                        else
                                warning $output
                                warning "Failed ldif export of $dbsuffix"
@@ -84,6 +76,11 @@ if [ "$ldif" == "yes" ]; then
                                output=`$GZIP -f "$dumpdir/$dbsuffix.ldif" 2>&1`
                                debug $output
                        fi
+
+                       if [ "$restart" == "yes" ]; then
+                               debug "Starting ldap server..."
+                               /etc/init.d/slapd start
+                       fi
                fi
        done    
 fi