Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c
diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.22 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.23
*** squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.22	Thu Sep 1 16:47:19 2005
--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c	Sat Sep 10 18:53:23 2005
***************
*** 259,270 ****
 }
 if (use_tls) {
 #ifdef LDAP_OPT_X_TLS
! if (version == LDAP_VERSION3 && ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
! 	 fprintf(stderr, "Could not Activate TLS connection\n");
! 	 exit(1);
! 	} else {
 	 fprintf(stderr, "TLS requires LDAP version 3\n");
 	 exit(1);
 	}
 #else
 	fprintf(stderr, "TLS not supported with your LDAP library\n");
--- 259,270 ----
 }
 if (use_tls) {
 #ifdef LDAP_OPT_X_TLS
! if (version != LDAP_VERSION3) {
 	 fprintf(stderr, "TLS requires LDAP version 3\n");
 	 exit(1);
+ 	} else if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
+ 	 fprintf(stderr, "Could not Activate TLS connection\n");
+ 	 exit(1);
 	}
 #else
 	fprintf(stderr, "TLS not supported with your LDAP library\n");
Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c
diff -c squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.23 squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.24
*** squid/helpers/external_acl/ldap_group/squid_ldap_group.c:1.2.2.23	Tue Mar 22 15:54:27 2005
--- squid/helpers/external_acl/ldap_group/squid_ldap_group.c	Sat Sep 10 18:53:23 2005
***************
*** 499,512 ****
 		}
 		if (use_tls) {
 #ifdef LDAP_OPT_X_TLS
! 		 if (version == LDAP_VERSION3 && ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
 			fprintf(stderr, "Could not Activate TLS connection\n");
 			ldap_unbind(ld);
 			ld = NULL;
 			break;
- 		 } else {
- 			fprintf(stderr, "TLS requires LDAP version 3\n");
- 			exit(1);
 		 }
 #else
 		 fprintf(stderr, "TLS not supported with your LDAP library\n");
--- 499,512 ----
 		}
 		if (use_tls) {
 #ifdef LDAP_OPT_X_TLS
! 		 if (version != LDAP_VERSION3) {
! 			fprintf(stderr, "TLS requires LDAP version 3\n");
! 			exit(1);
! 		 } else if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
 			fprintf(stderr, "Could not Activate TLS connection\n");
 			ldap_unbind(ld);
 			ld = NULL;
 			break;
 		 }
 #else
 		 fprintf(stderr, "TLS not supported with your LDAP library\n");
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-LDAP_TLS.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-LDAP_TLS.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>