|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.140 2006/08/21 19:21:38 tgl Exp $ |
| 11 | + * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.141 2006/08/22 02:23:45 tgl Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -68,8 +68,7 @@ static Port *pam_port_cludge;/* Workaround for passing "Port *port" into |
68 | 68 |
|
69 | 69 | #ifdefUSE_LDAP |
70 | 70 | #ifndefWIN32 |
71 | | -/* We use a deprecated function to keep the codepaths the same as the |
72 | | - * win32 one. */ |
| 71 | +/* We use a deprecated function to keep the codepath the same as win32. */ |
73 | 72 | #defineLDAP_DEPRECATED 1 |
74 | 73 | #include<ldap.h> |
75 | 74 | #else |
@@ -710,8 +709,6 @@ CheckPAMAuth(Port *port, char *user, char *password) |
710 | 709 | staticint |
711 | 710 | CheckLDAPAuth(Port*port) |
712 | 711 | { |
713 | | -static__ldap_start_tls_sA_ldap_start_tls_sA=NULL; |
714 | | - |
715 | 712 | char*passwd; |
716 | 713 | charserver[128]; |
717 | 714 | charbasedn[128]; |
@@ -807,8 +804,10 @@ CheckLDAPAuth(Port *port) |
807 | 804 | if (ssl) |
808 | 805 | { |
809 | 806 | #ifndefWIN32 |
810 | | -if ((r=ldap_start_tls_s(ldap,NULL,NULL))!=LDAP_SUCCESS) |
| 807 | +if ((r=ldap_start_tls_s(ldap,NULL,NULL))!=LDAP_SUCCESS) |
811 | 808 | #else |
| 809 | +static__ldap_start_tls_sA_ldap_start_tls_sA=NULL; |
| 810 | + |
812 | 811 | if (_ldap_start_tls_sA==NULL) |
813 | 812 | { |
814 | 813 | /* |
|