Apply Wes's kbind fix (ITS#426). Needs to be reconciled with

devel's kbind fix.

diff --git a/CHANGES b/CHANGES
index 03570b95fdb546bbd1c51a67a4a5fb560a41def6..80f40d00bd4d2847aece31eeadc6e4002391d779 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Changes included in OpenLDAP 1.2.10 Release Engineering
        Add slapd -DSLAPD_UNDEFINED_OC_IS_NOT_EXTENSIBLE macro disable
                undefined object classes implies extensible object behavior.
        Add GNU Pth support (ITS#453)
+       Fixed -lldap Kerberos bind to work ldap_init() (ITS#426)
        Changed -lldap to ignore space in filter: ( !(foo=bar)) (ITS#459)
        Fixed multiple password support (ITS#464)
        Fixed back-ldbm/bind invalid credentials vs no such object bug 

diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index 4417a129b4ad03b0c421ab9a9b820101100fae5c..c399d31c81544a4610a732d8da37917ed6b2c372 100644 (file)
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -261,6 +261,10 @@ ldap_get_kerberosv4_credentials( LDAP *ld, char *who, char *service, int *len )
                return( NULL );
        }
 
+       if ( ldap_delayed_open( ld ) < 0 ) {
+               return( NULL );
+       }
+
 #ifdef LDAP_REFERRALS
        krbinstance = ld->ld_defconn->lconn_krbinstance;
 #else /* LDAP_REFERRALS */

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 190d4028b9c4795b02b7c64f75c6af0bc39fd6de..b5cf355a0fa338eef8b0c284b07463c6589870c7 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -53,31 +53,9 @@ ldap_open( char *host, int port )
                return( NULL );
        }
 
-#ifdef LDAP_REFERRALS
-       if (( srv = (LDAPServer *)calloc( 1, sizeof( LDAPServer ))) ==
-           NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
-           ldap_strdup( ld->ld_defhost )) == NULL )) {
-               if(srv != NULL) free( (char*) srv );
-               ldap_ld_free( ld, 0 );
-               return( NULL );
-       }
-       srv->lsrv_port = ld->ld_defport;
-
-       if (( ld->ld_defconn = ldap_new_connection( ld, &srv, 1,1,0 )) == NULL ) {
-               if ( ld->ld_defhost != NULL ) free( srv->lsrv_host );
-               free( (char *)srv );
-               ldap_ld_free( ld, 0 );
+       if ( ldap_delayed_open( ld ) < 0 ) {
                return( NULL );
        }
-       ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
-
-#else /* LDAP_REFERRALS */
-       if ( open_ldap_connection( ld, &ld->ld_sb, ld->ld_defhost,
-           ld->ld_defport, &ld->ld_host, 0 ) < 0 ) {
-               ldap_ld_free( ld, 0 );
-               return( NULL );
-       }
-#endif /* LDAP_REFERRALS */
 
        Debug( LDAP_DEBUG_TRACE, "ldap_open successful, ld_host is %s\n",
                ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 71c62d035b312f3d6354f25634f0081bd20aa30b..33d7d67dc6af5c68087fad22797863ed0e36d3db 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -71,16 +71,14 @@ ldap_set_ber_options( LDAP *ld, BerElement *ber )
 #endif /* STR_TRANSLATION */
 }
 
-
 int
-ldap_send_initial_request( LDAP *ld, unsigned long msgtype, char *dn,
-       BerElement *ber )
+ldap_delayed_open( LDAP *ld )
 {
 #if defined( LDAP_REFERRALS ) || defined( LDAP_DNS )
        LDAPServer      *servers, *srv;
 #endif /* LDAP_REFERRALS || LDAP_DNS */
 
-       Debug( LDAP_DEBUG_TRACE, "ldap_send_initial_request\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "ldap_delayed_open\n", 0, 0, 0 );
 
        if ( ld->ld_sb.sb_sd == -1 ) {
                /* not connected yet */
@@ -116,12 +114,24 @@ ldap_send_initial_request( LDAP *ld, unsigned long msgtype, char *dn,
                        return( -1 );
                }
 #endif /* LDAP_REFERRALS */
-
-               Debug( LDAP_DEBUG_TRACE,
-                       "ldap_delayed_open successful, ld_host is %s\n",
-                       ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );
        }
 
+       return( 0 );
+}
+
+int
+ldap_send_initial_request( LDAP *ld, unsigned long msgtype, char *dn,
+       BerElement *ber )
+{
+#if defined( LDAP_REFERRALS ) || defined( LDAP_DNS )
+       LDAPServer      *servers, *srv;
+#endif /* LDAP_REFERRALS || LDAP_DNS */
+
+       Debug( LDAP_DEBUG_TRACE, "ldap_send_initial_request\n", 0, 0, 0 );
+
+       if ( ldap_delayed_open( ld ) < 0 ) {
+               return( -1 );
+       }
 
 #if !defined( LDAP_REFERRALS ) && !defined( LDAP_DNS )