X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=inline;f=handlers%2Fldap.in;h=0868eac9086f4a9bd9837d22d2d9bf3b171727d7;hb=9f3e4b65cddecc6ff373f0dd9ac646ca5d47c356;hp=c667ce55e24541ef31ae317b2fbfcb1bd3058ab6;hpb=f1fa36165a9160da7ddd0f0a9647d238e731e65f;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/handlers/ldap.in b/handlers/ldap.in
index c667ce5..0868eac 100644
--- a/handlers/ldap.in
+++ b/handlers/ldap.in
@@ -40,9 +40,11 @@ else
    [ -z "$vsnames" ] || warning 'vservers support disabled in backupninja.conf, vsnames configuration line will be ignored'
 fi
 
+[ "$restart" = yes -a "$method" = ldapsearch ] && warning 'restart option should not be used with the ldapsearch method.'
+
 status="ok"
 
-make_backup() {
+function make_backup() {
    vsname=$1
    if [ -z "$vsname" ]; then
       info "Running on host"
@@ -54,18 +56,18 @@ make_backup() {
       vexec="$VSERVER $vsname exec"
    fi
 
+   dumpdir=`interpolate "$backupdir" "$vsname"`
+   info "Backing up to dir '$dumpdir'"
+
    [ -f $vdir$conf ] || fatal "slapd config file ($conf) not found"
-   [ -d $backupdir ] || mkdir -p $backupdir
-   [ -d $backupdir ] || fatal "Backup directory '$backupdir'"
+   [ -d $dumpdir ] || mkdir -p $dumpdir
+   [ -d $dumpdir ] || fatal "Backup directory '$dumpdir'"
 
    dbsuffixes=(`@AWK@ 'BEGIN {OFS=":"} /[:space:]*^database[:space:]*\w*/ {db=$2}; /^[:space:]*suffix[:space:]*\w*/ {if (db=="bdb"||db=="hdb"||db="ldbm") print db,$2}' $vdir$conf|@SED@ -e 's/[" ]//g'`)
 
    ## LDIF DUMP
 
    if [ "$ldif" == "yes" ]; then
-      dumpdir="$backupdir"
-      [ -d $dumpdir ] || mkdir -p $dumpdir
-      
       if [ "$databases" == 'all' ]; then
          dbcount=`grep '^database' $vdir$conf | wc -l`
          let "dbcount = dbcount - 1"