projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added helper for pgsql handler.
[matthijs/upstream/backupninja.git]
/
handlers
/
ldap
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 [ "$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"
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
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
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 [ "$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"
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
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
fi
done
fi