diff options
| author | forums <forums@ns38133.ovh.net> | 2011-02-12 22:25:42 +0100 |
|---|---|---|
| committer | forums <forums@ns38133.ovh.net> | 2011-02-12 22:25:42 +0100 |
| commit | ef7e5a387cf857250024e94d45991ca51ee40b87 (patch) | |
| tree | 4ab906ce878886c485534cd5c99556f6a59402ef | |
| parent | e8f8d005b1dc98af44001fad494c7da3f010d9bd (diff) | |
| download | forums-ef7e5a387cf857250024e94d45991ca51ee40b87.tar forums-ef7e5a387cf857250024e94d45991ca51ee40b87.tar.gz forums-ef7e5a387cf857250024e94d45991ca51ee40b87.tar.bz2 forums-ef7e5a387cf857250024e94d45991ca51ee40b87.tar.xz forums-ef7e5a387cf857250024e94d45991ca51ee40b87.zip | |
Patched ldap auth (+tls) (report patch upstream ?)
| -rw-r--r-- | phpBB/includes/auth/auth_ldap.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index e8c957aaa3..33413094ef 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -51,6 +51,9 @@ function init_ldap() @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); @ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); + + /* Patch by maat */ + @ldap_start_tls($ldap); if ($config['ldap_user'] || $config['ldap_password']) { @@ -152,6 +155,9 @@ function login_ldap(&$username, &$password) @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); @ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); + /* Patch by maat */ + @ldap_start_tls($ldap); + if ($config['ldap_user'] || $config['ldap_password']) { if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password']))) @@ -346,4 +352,4 @@ function acp_ldap(&$new) ); } -?>
\ No newline at end of file +?> |