Minor adjustments based upon initial read of draft-ietf-ldapext-ldap-c-api-04.txt.

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 419b4277e0cca5b215c193fe9fd04a0d034cfdee..1551ec66f35102f278ac1d47d99e5b20c1510a9a 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -25,6 +26,33 @@
 
 #include "ldap-int.h"
 
+int ldap_open_defconn( LDAP *ld )
+{
+       LDAPServer      *srv;
+
+       if (( srv = (LDAPServer *)LDAP_CALLOC( 1, sizeof( LDAPServer ))) ==
+           NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
+           LDAP_STRDUP( ld->ld_defhost )) == NULL ))
+       {
+               if( srv != NULL ) LDAP_FREE( (char*) srv );
+               ld->ld_errno = LDAP_NO_MEMORY;
+               return -1;
+       }
+
+       srv->lsrv_port = ld->ld_defport;
+
+       if (( ld->ld_defconn = ldap_new_connection( ld, &srv, 1,1,0 )) == NULL )
+       {
+               if ( ld->ld_defhost != NULL ) LDAP_FREE( srv->lsrv_host );
+               LDAP_FREE( (char *)srv );
+               ld->ld_errno = LDAP_SERVER_DOWN;
+               return -1;
+       }
+
+       ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
+
+       return 0;
+}
 
 /*
  * ldap_open - initialize and connect to an ldap server.  A magic cookie to
@@ -39,8 +67,8 @@
 LDAP *
 ldap_open( LDAP_CONST char *host, int port )
 {
+       int rc;
        LDAP            *ld;
-       LDAPServer      *srv;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 );
 
@@ -48,22 +76,12 @@ ldap_open( LDAP_CONST char *host, int port )
                return( NULL );
        }
 
-       if (( srv = (LDAPServer *)LDAP_CALLOC( 1, sizeof( LDAPServer ))) ==
-           NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
-           LDAP_STRDUP( ld->ld_defhost )) == NULL )) {
-               if(srv != NULL) LDAP_FREE( (char*) srv );
-               ldap_ld_free( ld, 0, NULL, NULL );
-               return( NULL );
-       }
-       srv->lsrv_port = ld->ld_defport;
+       rc = ldap_open_defconn( ld );
 
-       if (( ld->ld_defconn = ldap_new_connection( ld, &srv, 1,1,0 )) == NULL ) {
-               if ( ld->ld_defhost != NULL ) LDAP_FREE( srv->lsrv_host );
-               LDAP_FREE( (char *)srv );
+       if( rc < 0 ) {
                ldap_ld_free( ld, 0, NULL, NULL );
                return( NULL );
        }
-       ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
 
        Debug( LDAP_DEBUG_TRACE, "ldap_open successful, ld_host is %s\n",
                ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );
@@ -236,13 +254,13 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, const char *host, int defport,
                            port = defport;   
                        }
 
-                       if (( rc = ldap_connect_to_host( sb, curhost, 0L,
+                       if (( rc = ldap_connect_to_host( ld, sb, curhost, 0L,
                            port, async )) != -1 ) {
                                break;
                        }
                }
        } else {
-               rc = ldap_connect_to_host( sb, NULL, htonl( INADDR_LOOPBACK ),
+               rc = ldap_connect_to_host( ld, sb, 0, htonl( INADDR_LOOPBACK ),
                    defport, async );
        }