squid-2.5.STABLE4-ldap_tls.patch

   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.6 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.7
   3 *** squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.6    Sat May 10 14:17:18 2003
   4 --- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c     Mon Jan  5 05:00:16 2004
   5 ***************
   6 *** 445,451 ****
   7                   exit(1);
   8             }
   9
  10 !           if ( use_tls && ( version == LDAP_VERSION3 ) && ( ldap_start_tls_s( ld, NULL, NULL ) == LDAP_SUCCESS )) {
  11                   fprintf( stderr, "Could not Activate TLS connection\n");
  12                   exit(1);
  13             }
  14 --- 445,451 ----
  15                   exit(1);
  16             }
  17
  18 !           if ( use_tls && ( version == LDAP_VERSION3 ) && ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS )) {
  19                   fprintf( stderr, "Could not Activate TLS connection\n");
  20                   exit(1);
  21             }
  22 Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c
  23 diff -c squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.13 squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.14
  24 *** squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.13   Fri Nov 21 10:13:58 2003
  25 --- squid/helpers/external_acl/ldap_group/squid_ldap_group.c    Mon Jan  5 05:00:17 2004
  26 ***************
  27 *** 491,497 ****
  28                     ld = NULL;
  29                     break;
  30                 }
  31 !               if (use_tls && (version == LDAP_VERSION3) && (ldap_start_tls_s(ld, NULL, NULL) == LDAP_SUCCESS)) {
  32                     fprintf(stderr, "Could not Activate TLS connection\n");
  33                     ldap_unbind(ld);
  34                     ld = NULL;
  35 --- 491,497 ----
  36                     ld = NULL;
  37                     break;
  38                 }
  39 !               if (use_tls && (version == LDAP_VERSION3) && (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS)) {
  40                     fprintf(stderr, "Could not Activate TLS connection\n");
  41                     ldap_unbind(ld);
  42                     ld = NULL;