[evolvis-commits] r8916: Added sys_ldap_version with 3 as default in local. inc↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:55:28 CET 2011


Author: mirabilos
Date: 2011-02-24 16:55:27 +0100 (Thu, 24 Feb 2011)
New Revision: 8916

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/include/ldap.php
   trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/local.inc.template
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
Log:
Added sys_ldap_version with 3 as default in local.inc


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/ldap.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/ldap.php	2011-02-24 15:55:26 UTC (rev 8915)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/ldap.php	2011-02-24 15:55:27 UTC (rev 8916)
@@ -124,7 +124,7 @@
  */
 function sf_ldap_connect() {
 	global $sys_ldap_host,$sys_ldap_port;
-	global $sys_ldap_bind_dn,$sys_ldap_passwd,$ldap_conn;
+	global $sys_ldap_bind_dn,$sys_ldap_passwd,$ldap_conn,$sys_ldap_version;
 
 	if (!$ldap_conn) {
 		sf_ldap_reset_error_msg();
@@ -134,6 +134,9 @@
 			return false;
 		}
 		ldap_bind($ldap_conn,$sys_ldap_bind_dn,$sys_ldap_passwd);
+		if ($sys_ldap_version) {
+			ldap_set_option($ldapdatads, LDAP_OPT_PROTOCOL_VERSION, $sys_ldap_version);
+		}
 	}
 	return true;
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/local.inc.template
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/local.inc.template	2011-02-24 15:55:26 UTC (rev 8915)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/local.inc.template	2011-02-24 15:55:27 UTC (rev 8916)
@@ -94,6 +94,7 @@
 $sys_use_ldap=1;
 $sys_ldap_host="{ldap_host}";
 $sys_ldap_port=389;
+$sys_ldap_version=3;
 // this is dn under which all information stored
 $sys_ldap_base_dn="{ldap_base_dn}";
 // and this, how we do access it (add permission required)

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-24 15:55:26 UTC (rev 8915)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-24 15:55:27 UTC (rev 8916)
@@ -6,8 +6,10 @@
   * [Roland] Do not take the availability of mod_userdir.c for granted.
     Patch from Tomas Pospisek <tpo_deb at sourcepole.ch> (closes: #197606).
   * [Roland] Bumped Standards-Version: to 3.5.10 (no changes needed).
+  * [Christian] added sys_ldap_version variable and take it in account if
+    defined in common/include/ldap.php after bind
 
- -- Roland Mas <lolando at debian.org>  Mon, 23 Jun 2003 22:16:03 +0200
+ -- Christian Bayle <bayle at debian.org>  Sun, 29 Jun 2003 14:14:43 +0200
 
 gforge (3rc2-4) unstable; urgency=low
 



More information about the evolvis-commits mailing list