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

diff --git a/handlers/ldap b/handlers/ldap
index 9ead9d1..e789519 100644
--- a/handlers/ldap
+++ b/handlers/ldap
@@ -7,9 +7,10 @@ getconf conf /etc/ldap/slapd.conf
 getconf databases all
 getconf compress yes
 getconf ldif yes
-getconf hotcopy no
-
-# hot copy is not yet supported
+getconf restart no
+getconf method ldapsearch
+getconf passwordfile
+getconf binddn
 
 status="ok"
 
@@ -42,18 +43,39 @@ if [ "$ldif" == "yes" ]; then
 		if [ "$dbsuffix" == "" ]; then
 			continue;
 		fi
-		touch $dumpdir/$dbsuffix.ldif
-		if [ ! -f $dumpdir/$dbsuffix.ldif ]; then
-			fatal "Couldn't create ldif dump file: $dumpdir/$dbsuffix.ldif"
+
+		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"
+			if [ "$restart" == "yes" ]; then
+				debug "Shutting down ldap server..."
+				/etc/init.d/slapd stop
+			fi
+			debug "$execstr"
 		fi
-		execstr="$SLAPCAT -f $conf -b $dbsuffix -l $dumpdir/$dbsuffix.ldif"
-		debug "$execstr"
 		if [ ! $test ]; then
-			output=`$execstr`
+
+			touch $dumpdir/$dbsuffix.ldif
+			if [ ! -f $dumpdir/$dbsuffix.ldif ]; then
+				fatal "Couldn't create ldif dump file: $dumpdir/$dbsuffix.ldif"
+			fi
+
+			output=`$execstr > $dumpdir/$dbsuffix.ldif`
 			code=$?
 			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"