From ef7e5a387cf857250024e94d45991ca51ee40b87 Mon Sep 17 00:00:00 2001 From: forums Date: Sat, 12 Feb 2011 22:25:42 +0100 Subject: Patched ldap auth (+tls) (report patch upstream ?) --- phpBB/includes/auth/auth_ldap.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'phpBB') 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 +?> -- cgit v1.2.1