projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup ldap SSL/TLS options, make TLS default in helper, Closes: Trac#13
[matthijs/upstream/backupninja-vserver.git]
/
handlers
/
ldap.helper.in
diff --git
a/handlers/ldap.helper.in
b/handlers/ldap.helper.in
index 5ccbe7e860726e3ab822270d24b3cb332ab828ef..35b47a34e0b397f3638d9f8a5a1b78501402d778 100644
(file)
--- a/
handlers/ldap.helper.in
+++ b/
handlers/ldap.helper.in
@@
-7,13
+7,17
@@
while true; do
checkBox "ldap action wizard" "check options (slapcat OR ldapsearch)" \
"slapcat" "export ldif using slapcat" yes \
"ldapsearch" "export ldif using ldapsearch" no \
checkBox "ldap action wizard" "check options (slapcat OR ldapsearch)" \
"slapcat" "export ldif using slapcat" yes \
"ldapsearch" "export ldif using ldapsearch" no \
- "compress" "compress the ldif output files" yes
+ "compress" "compress the ldif output files" yes \
+ "ssl" "use SSL (deprecated)" no \
+ "tls" "use TLS extended operations (RFC2246, RFC2830)" yes
status=$?
compress="compress = no"
method="method = <unset>"
restart="restart = no"
binddn=""
passwordfile=""
status=$?
compress="compress = no"
method="method = <unset>"
restart="restart = no"
binddn=""
passwordfile=""
+ ssl="ssl = no"
+ tls="tls = no"
[ $status = 1 ] && return;
result="$REPLY"
for opt in $result; do
[ $status = 1 ] && return;
result="$REPLY"
for opt in $result; do
@@
-33,6
+37,8
@@
while true; do
binddn="binddn = $REPLY"
require_packages ldap-utils
;;
binddn="binddn = $REPLY"
require_packages ldap-utils
;;
+ '"ssl"') ssl="ssl = yes";;
+ '"tls"') tls="tls = yes";;
esac
done
get_next_filename $configdirectory/30.ldap
esac
done
get_next_filename $configdirectory/30.ldap
@@
-42,6
+48,8
@@
$compress
$restart
$binddn
$passwordfile
$restart
$binddn
$passwordfile
+$ssl
+$tls
# backupdir = /var/backups/ldap
# conf = /etc/ldap/slapd.conf
# databases = all
# backupdir = /var/backups/ldap
# conf = /etc/ldap/slapd.conf
# databases = all