| d29ec517 |
1 | Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c |
| 2 | diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.21 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.22 |
| 3 | *** squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.21 Fri Apr 22 14:29:29 2005 |
| 4 | --- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c Thu Sep 1 16:47:19 2005 |
| 5 | *************** |
| 6 | *** 672,685 **** |
| 7 | } |
| 8 | |
| 9 | if (debug) |
| 10 | ! fprintf(stderr, "attempting to bind to user '%s'\n", dn); |
| 11 | if (!bind_ld && !bind_once) |
| 12 | bind_ld = persistent_ld; |
| 13 | if (!bind_ld) |
| 14 | bind_ld = open_ldap_connection(ldapServer, port); |
| 15 | ! if (passwdattr && ldap_compare_s(bind_ld, dn, passwdattr, password) != LDAP_COMPARE_TRUE) |
| 16 | ! ret = 1; |
| 17 | ! else if (ldap_simple_bind_s(bind_ld, dn, password) != LDAP_SUCCESS) |
| 18 | ret = 1; |
| 19 | if (bind_ld != persistent_ld) { |
| 20 | ldap_unbind(bind_ld); |
| 21 | --- 672,687 ---- |
| 22 | } |
| 23 | |
| 24 | if (debug) |
| 25 | ! fprintf(stderr, "attempting to authenticate user '%s'\n", dn); |
| 26 | if (!bind_ld && !bind_once) |
| 27 | bind_ld = persistent_ld; |
| 28 | if (!bind_ld) |
| 29 | bind_ld = open_ldap_connection(ldapServer, port); |
| 30 | ! if (passwdattr) { |
| 31 | ! if (ldap_compare_s(bind_ld, dn, passwdattr, password) != LDAP_COMPARE_TRUE) { |
| 32 | ! ret = 1; |
| 33 | ! } |
| 34 | ! } else if (ldap_simple_bind_s(bind_ld, dn, password) != LDAP_SUCCESS) |
| 35 | ret = 1; |
| 36 | if (bind_ld != persistent_ld) { |
| 37 | ldap_unbind(bind_ld); |
projects / packages / squid.git / blame