diff options
| author | Micah Anderson <micah@riseup.net> | 2007-11-24 23:23:08 +0000 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2007-11-24 23:23:08 +0000 |
| commit | ca62d94c56df7ee24a46c0de657930b48a04711d (patch) | |
| tree | 4f3bc7ee1e568e01d97c1ae66eefdf0740243b37 /handlers/ldap.in | |
| parent | 84a6d7fa7a6c2ebd4e2b6687dba8fc6addfb843a (diff) | |
| download | backupninja-ca62d94c56df7ee24a46c0de657930b48a04711d.tar.gz backupninja-ca62d94c56df7ee24a46c0de657930b48a04711d.tar.bz2 | |
fixup ldap SSL/TLS options, make TLS default in helper, Closes: Trac#13
Diffstat (limited to 'handlers/ldap.in')
| -rw-r--r-- | handlers/ldap.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/handlers/ldap.in b/handlers/ldap.in index f6f87c7..e5e21ba 100644 --- a/handlers/ldap.in +++ b/handlers/ldap.in @@ -13,9 +13,10 @@ getconf method ldapsearch getconf passwordfile getconf binddn getconf ldaphost -getconf tls yes +getconf ssl yes +getconf tls no -if [ $tls = 'yes' ]; then +if [ $ssl = 'yes' ]; then URLBASE="ldaps" else URLBASE="ldap" @@ -56,10 +57,14 @@ if [ "$ldif" == "yes" ]; then if [ "$method" == "slapcat" ]; then execstr="$SLAPCAT -f $conf -b $dbsuffix" else + LDAPARGS="" + if [ "$tls" == "yes" ]; then + LDAPARGS="-ZZ" + fi if [ -n "$ldaphost" ]; then - execstr="$LDAPSEARCH -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile" + execstr="$LDAPSEARCH $LDAPARGS -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile" else - execstr="$LDAPSEARCH -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile" + execstr="$LDAPSEARCH -H $URLBASE://$ldaphost -x -L -b ""$dbsuffix"" -D ""$binddn"" -y $passwordfile" fi [ -f "$passwordfile" ] || fatal "Password file $passwordfile not found. When method is set to ldapsearch, you must also specify a password file." debug "$execstr" |