Skip to content
Snippets Groups Projects
Commit f9a09063 authored by intrigeri's avatar intrigeri
Browse files

LDAP: support HDB backend just as the BDB one

parent 7772134e
Branches
Tags
No related merge requests found
...@@ -10,6 +10,8 @@ version 0.9.6 -- unreleased ...@@ -10,6 +10,8 @@ version 0.9.6 -- unreleased
only trigger a warning on failure, since they should not stop backups only trigger a warning on failure, since they should not stop backups
from being done. Also migrated full/incremental backup switch to the from being done. Also migrated full/incremental backup switch to the
new syntax. new syntax.
ldap:
. support HDB backend just as the BDB one (Closes: #476910)
rdiff: rdiff:
. Fixed ignore_version default value missing . Fixed ignore_version default value missing
. Add patch from Matthew Palmer to rdiff handler to incorporate sshoptions . Add patch from Matthew Palmer to rdiff handler to incorporate sshoptions
......
...@@ -61,19 +61,24 @@ done ...@@ -61,19 +61,24 @@ done
ldap_wizard() { ldap_wizard() {
bdb=no bdb=no
hdb=no
ldbm=no ldbm=no
for backend in `grep -e "^backend" /etc/ldap/slapd.conf | @AWK@ '{print $2}'`; do 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 bdb=yes
elif [ "$backend" == "ldbm" -a "$ldbm" == "no" ]; then elif [ "$backend" == "hdb" ]; then
hdb=yes
elif [ "$backend" == "ldbm" ]; then
ldbm=yes ldbm=yes
fi fi
done done
if [ "$bdb" == "yes" -a "$ldbm" == "no" ]; then if [ "$bdb" == "yes" -o "$hdb" == "yes" ]; 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." 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 _RESTART=no
ldap_create_file ldap_create_file
fi
elif [ "$ldbm" == "yes" ]; then 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)." 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 _RESTART=yes
...@@ -83,4 +88,3 @@ ldap_wizard() { ...@@ -83,4 +88,3 @@ ldap_wizard() {
return return
fi fi
} }
...@@ -28,7 +28,7 @@ status="ok" ...@@ -28,7 +28,7 @@ status="ok"
[ -d $backupdir ] || mkdir -p $backupdir [ -d $backupdir ] || mkdir -p $backupdir
[ -d $backupdir ] || fatal "Backup directory '$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 ## LDIF DUMP
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment