diff -Naur cacti-0.8.6h/auth_login.php cacti-0.8.6h.ldap_protocol/auth_login.php --- cacti-0.8.6h/auth_login.php 2006-01-04 04:08:30.000000000 +0100 +++ cacti-0.8.6h.ldap_protocol/auth_login.php 2006-03-17 19:52:59.000000000 +0100 @@ -35,6 +35,7 @@ $ldap_conn = ldap_connect(read_config_option("ldap_server")); if ($ldap_conn) { + ldap_set_option($ldap_conn, LDAP_OPT_PROTOCOL_VERSION, read_config_option("ldap_protocol")); $ldap_dn = str_replace("<username>",$_POST["login_username"],read_config_option("ldap_dn")); $ldap_response = @ldap_bind($ldap_conn,$ldap_dn,$_POST["login_password"]); diff -Naur cacti-0.8.6h/include/config_arrays.php cacti-0.8.6h.ldap_protocol/include/config_arrays.php --- cacti-0.8.6h/include/config_arrays.php 2006-01-04 04:08:30.000000000 +0100 +++ cacti-0.8.6h.ldap_protocol/include/config_arrays.php 2006-03-18 20:39:30.000000000 +0100 @@ -166,6 +166,10 @@ PING_ICMP => "ICMP Ping", PING_UDP => "UDP Ping"); +$ldap_protocols = array( + LDAP_PROTOCOL_2 => "2", + LDAP_PROTOCOL_3 => "3"); + $logfile_verbosity = array( POLLER_VERBOSITY_NONE => "NONE - Syslog Only if Selected", POLLER_VERBOSITY_LOW => "LOW - Statistics and Errors", diff -Naur cacti-0.8.6h/include/config_constants.php cacti-0.8.6h.ldap_protocol/include/config_constants.php --- cacti-0.8.6h/include/config_constants.php 2006-01-04 04:08:30.000000000 +0100 +++ cacti-0.8.6h.ldap_protocol/include/config_constants.php 2006-03-18 20:38:29.000000000 +0100 @@ -120,4 +120,7 @@ define("SNMP_CMDPHP", 1); define("SNMP_WEBUI", 2); +define("LDAP_PROTOCOL_2", 2); +define("LDAP_PROTOCOL_3", 3); + ?> diff -Naur cacti-0.8.6h/include/config_settings.php cacti-0.8.6h.ldap_protocol/include/config_settings.php --- cacti-0.8.6h/include/config_settings.php 2006-01-04 04:08:30.000000000 +0100 +++ cacti-0.8.6h.ldap_protocol/include/config_settings.php 2006-03-18 20:39:12.000000000 +0100 @@ -636,6 +636,13 @@ "method" => "textbox", "max_length" => "100" ), + "ldap_protocol" => array( + "friendly_name" => "LDAP protocol", + "description" => "The LDAP protocol to connect to the server", + "method" => "drop_array", + "default" => LDAP_PROTOCOL_2, + "array" => $ldap_protocols, + ), "ldap_dn" => array( "friendly_name" => "LDAP DN", "description" => "This is the Distinguished Name syntax, such as <username>@win2kdomain.lcl.",