aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Saxon <elijah@riseup.net>2005-06-28 06:24:33 +0000
committerElijah Saxon <elijah@riseup.net>2005-06-28 06:24:33 +0000
commit0abb625ac2434a967e04a07020cb042a6f9a9982 (patch)
treed4d195f50179f2d0ad20063af627a34f6bc23195
parentb3b70a8e5d81df13d076505157b5ffc221a42709 (diff)
downloadbackupninja-0abb625ac2434a967e04a07020cb042a6f9a9982.tar.gz
backupninja-0abb625ac2434a967e04a07020cb042a6f9a9982.tar.bz2
improved error message if password file not found
moved start/stop ldap code so that it makes sense.
-rw-r--r--handlers/ldap21
1 files changed, 9 insertions, 12 deletions
diff --git a/handlers/ldap b/handlers/ldap
index e789519..3bc01d4 100644
--- 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