X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fldap.helper.in;h=4870ae47277fb39d47b1ab57957f637efb9fae4b;hp=35b47a34e0b397f3638d9f8a5a1b78501402d778;hb=4ecaae94054c4eb919ddbd45904d834383a09558;hpb=ca62d94c56df7ee24a46c0de657930b48a04711d

diff --git a/handlers/ldap.helper.in b/handlers/ldap.helper.in
index 35b47a3..4870ae4 100644
--- a/handlers/ldap.helper.in
+++ b/handlers/ldap.helper.in
@@ -3,7 +3,7 @@
 HELPERS="$HELPERS ldap:ldap_database_backup"
 
 ldap_create_file() {
-while true; do
+   while true; do
       checkBox "ldap action wizard" "check options (slapcat OR ldapsearch)" \
          "slapcat" "export ldif using slapcat" yes \
          "ldapsearch" "export ldif using ldapsearch" no \
@@ -22,21 +22,21 @@ while true; do
       result="$REPLY"
       for opt in $result; do
          case $opt in
-           '"compress"') compress="compress = yes";;
-           '"slapcat"')
-              method="method = slapcat"
-              [ "$_RESTART" == "yes" ] && restart="restart = yes"
-              ;;
-           '"ldapsearch"')
-              method="method = ldapsearch"
-              inputBox "ldap action wizard" "ldapsearch requires authentication. Specify here what password file to use. It must have the password with no trailing return and it should not be world readable."
-              [ $? = 1 ] && return
-              passwordfile="passwordfile = $REPLY"
-              inputBox "ldap action wizard" "ldapsearch requires authentication. Specify here what DN to bind as:"
-              [ $? = 1 ] && return
-              binddn="binddn = $REPLY"
-              require_packages ldap-utils
-              ;;
+            '"compress"') compress="compress = yes";;
+            '"slapcat"')
+               method="method = slapcat"
+               [ "$_RESTART" == "yes" ] && restart="restart = yes"
+               ;;
+            '"ldapsearch"')
+               method="method = ldapsearch"
+               inputBox "ldap action wizard" "ldapsearch requires authentication. Specify here what password file to use. It must have the password with no trailing return and it should not be world readable."
+               [ $? = 1 ] && return
+               passwordfile="passwordfile = $REPLY"
+               inputBox "ldap action wizard" "ldapsearch requires authentication. Specify here what DN to bind as:"
+               [ $? = 1 ] && return
+               binddn="binddn = $REPLY"
+               require_packages ldap-utils
+               ;;
             '"ssl"') ssl="ssl = yes";;
             '"tls"') tls="tls = yes";;
          esac
@@ -54,33 +54,37 @@ $tls
 # conf = /etc/ldap/slapd.conf
 # databases = all
 EOF
-     chmod 600 $next_filename
-     return
-done
+      chmod 600 $next_filename
+      return
+   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    
+   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
-     ldap_create_file
+      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
+      ldap_create_file
    else
-     msgBox "ldap action wizard" "I couldn't find any backends in your slapd.conf. Bailing out." 
-     return
+      msgBox "ldap action wizard" "I couldn't find any supported backend in your slapd.conf. Bailing out."
+      return
    fi
 }
-