LDAP: support HDB backend just as the BDB one

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@565 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/ChangeLog b/ChangeLog
index ad826dd4c9f485a3a51ea44fbe025f281a1ee400..8783e89b56b8aaa8df62589004907bce05fe4ead 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ version 0.9.6 -- unreleased
           only trigger a warning on failure, since they should not stop backups
           from being done. Also migrated full/incremental backup switch to the
           new syntax.
+       ldap:
+        . support HDB backend just as the BDB one (Closes: #476910)
        rdiff:
         . Fixed ignore_version default value missing
         . Add patch from Matthew Palmer to rdiff handler to incorporate sshoptions

diff --git a/handlers/ldap.helper.in b/handlers/ldap.helper.in
index 35b47a34e0b397f3638d9f8a5a1b78501402d778..a00c40ae6734e7abc77da377d5ebd1bb8e88e24a 100644 (file)
--- a/handlers/ldap.helper.in
+++ b/handlers/ldap.helper.in
@@ -61,19 +61,24 @@ done
 
 ldap_wizard() {
    bdb=no
+   hdb=no
    ldbm=no
    for backend in `grep -e "^backend" /etc/ldap/slapd.conf | @AWK@ '{print $2}'`; do
-      if [ "$backend" == "bdb" -a "$bdb" == "no" ]; then
+      if [ "$backend" == "bdb" ]; then
          bdb=yes
-      elif [ "$backend" == "ldbm" -a "$ldbm" == "no" ]; then
+      elif [ "$backend" == "hdb" ]; then
+         hdb=yes
+      elif [ "$backend" == "ldbm" ]; then
          ldbm=yes
       fi
    done    
 
-   if [ "$bdb" == "yes" -a "$ldbm" == "no" ]; then
-     msgBox "ldap action wizard" "It looks like the backend in your slapd.conf is set to BDB. If this is not the case, exit this wizard! From this point on, we will assume BDB backend, which might have disasterious consequences if this is incorrect."
-     _RESTART=no
-     ldap_create_file
+   if [ "$bdb" == "yes" -o "$hdb" == "yes" ]; then
+      if [ "$ldbm" == "no" ]; then
+         msgBox "ldap action wizard" "It looks like the backend in your slapd.conf is set to BDB or HDB. If this is not the case, exit this wizard! From this point on, we will assume BDB or HDB backend, which might have disasterious consequences if this is incorrect."
+         _RESTART=no
+         ldap_create_file
+      fi
    elif [ "$ldbm" == "yes" ]; then
      msgBox "ldap action wizard" "It looks like the backend in your slapd.conf is set to LDBM. Because of this, you will have less options (because it is not safe to use slapcat while slapd is running LDBM)." 
      _RESTART=yes
@@ -83,4 +88,3 @@ ldap_wizard() {
      return
    fi
 }
-

diff --git a/handlers/ldap.in b/handlers/ldap.in
index e5e21bad7a029bcf1fc96298f4095f436413e55e..8ff1ccf097105d527071e793371494c8b8911120 100644 (file)
--- a/handlers/ldap.in
+++ b/handlers/ldap.in
@@ -28,7 +28,7 @@ status="ok"
 [ -d $backupdir ] || mkdir -p $backupdir
 [ -d $backupdir ] || fatal "Backup directory '$backupdir'"
 
-dbsuffixes=(`@AWK@ 'BEGIN {OFS=":"} /[:space:]*^database[:space:]*\w*/ {db=$2}; /^[:space:]*suffix[:space:]*\w*/ {if (db=="bdb"||db=="ldbm") print db,$2}' $conf|@SED@ -e 's/[" ]//g'`)
+dbsuffixes=(`@AWK@ 'BEGIN {OFS=":"} /[:space:]*^database[:space:]*\w*/ {db=$2}; /^[:space:]*suffix[:space:]*\w*/ {if (db=="bdb"||db=="hdb"||db="ldbm") print db,$2}' $conf|@SED@ -e 's/[" ]//g'`)
 
 ## LDIF DUMP