X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fldap;h=e6bdb22568881c1d3d388f992e4660147937daac;hb=0d606253af6ecb8ede07b0991a1f295fb70e7e65;hp=e7895190e54cc9c5011dcaf45fad8f95222588e2;hpb=4924d343a42e02af4d5af66571ce3a4d65ad22d6;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/ldap b/handlers/ldap
index e789519..e6bdb22 100644
--- a/handlers/ldap
+++ b/handlers/ldap
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # openldap backup handler script for backupninja
 #
@@ -46,21 +47,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 +69,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 +77,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