Add libtool support based upon patch by Bart Hartgers <Hartgers@kfm1.phys.tue.nl>

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index f92147f4150fdcbb0c919b07674a56b45c4282ed..2aa8eafcb259dc01894da1ca5b3b0b1481af666d 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -22,22 +22,12 @@ static char copyright[] = "@(#) Copyright (c) 1995 Regents of the University of
 #include <sys/param.h>
 #endif
 
-#include "lber.h"
-#include "ldap.h"
 #include "ldap-int.h"
 
 #ifdef LDAP_DEBUG
 int    ldap_debug;
 #endif
 
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK        ((unsigned long) 0x7f000001)
-#endif
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN  64
-#endif
-
 
 /*
  * ldap_open - initialize and connect to an ldap server.  A magic cookie to
@@ -53,9 +43,9 @@ LDAP *
 ldap_open( char *host, int port )
 {
        LDAP            *ld;
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        LDAPServer      *srv;
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
        Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 );
 
@@ -63,10 +53,13 @@ ldap_open( char *host, int port )
                return( NULL );
        }
 
-#ifdef LDAP_REFERRALS
+       /* we'll assume we're talking version 2 for now */
+       ld->ld_version = LDAP_VERSION2;
+
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        if (( srv = (LDAPServer *)calloc( 1, sizeof( LDAPServer ))) ==
            NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
-           strdup( ld->ld_defhost )) == NULL )) {
+           ldap_strdup( ld->ld_defhost )) == NULL )) {
                ldap_ld_free( ld, 0 );
                return( NULL );
        }
@@ -80,13 +73,13 @@ ldap_open( char *host, int port )
        }
        ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
 
-#else /* LDAP_REFERRALS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_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 */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
        Debug( LDAP_DEBUG_TRACE, "ldap_open successful, ld_host is %s\n",
                ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );
@@ -98,17 +91,21 @@ ldap_open( char *host, int port )
 /*
  * ldap_init - initialize the LDAP library.  A magic cookie to be used for
  * future communication is returned on success, NULL on failure.
- * "defhost" may be a space-separated list of hosts or IP addresses
+ * "host" may be a space-separated list of hosts or IP addresses
  *
  * Example:
  *     LDAP    *ld;
- *     ld = ldap_open( default_hostname, default_port );
+ *     ld = ldap_open( host, port );
  */
 LDAP *
 ldap_init( char *defhost, int defport )
 {
        LDAP                    *ld;
 
+       if(!openldap_ldap_initialized) {
+               openldap_ldap_initialize();
+       }
+
        Debug( LDAP_DEBUG_TRACE, "ldap_init\n", 0, 0, 0 );
 
 #ifdef HAVE_WINSOCK2
@@ -152,34 +149,42 @@ ldap_init( char *defhost, int defport )
                return( NULL );
        }
 
-#ifdef LDAP_REFERRALS
-       if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) {
+       /* copy the global options */
+       memcpy(&ld->ld_options, &openldap_ldap_global_options,
+               sizeof(ld->ld_options));
+
+       /* but not pointers to malloc'ed strings */
+       ld->ld_options.ldo_defbase = NULL;
+       ld->ld_options.ldo_defhost = NULL;
+
+       if ( defhost != NULL ) {
+               ld->ld_options.ldo_defhost = ldap_strdup( defhost );
+       } else {
+               ld->ld_options.ldo_defhost = ldap_strdup(
+                       openldap_ldap_global_options.ldo_defhost);
+       }
+
+       if ( ld->ld_options.ldo_defhost == NULL ) {
                free( (char*)ld );
            WSACleanup( );
                return( NULL );
        }
-       ld->ld_options = LDAP_OPT_REFERRALS;
-#endif /* LDAP_REFERRALS */
-
-       if ( defhost != NULL &&
-           ( ld->ld_defhost = strdup( defhost )) == NULL ) {
-#ifdef LDAP_REFERRALS
-               ldap_free_select_info( ld->ld_selectinfo );
-#endif /* LDAP_REFERRALS */
-               free( (char*)ld );
+
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+       if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) {
+               free( (char*) ld->ld_options.ldo_defhost );
+               free( (char*) ld->ld_options.ldo_defbase );
+               free( (char*) ld );
            WSACleanup( );
                return( NULL );
        }
+#endif
 
+       if(defport != 0) {
+               ld->ld_defport = defport;
+       }
 
-       ld->ld_defport = ( defport == 0 ) ? LDAP_PORT : defport;
-       ld->ld_version = LDAP_VERSION;
        ld->ld_lberoptions = LBER_USE_DER;
-       ld->ld_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
-
-#ifdef LDAP_REFERRALS
-        ld->ld_options |= LDAP_OPT_REFERRALS;
-#endif /* LDAP_REFERRALS */
 
 #if defined( STR_TRANSLATION ) && defined( LDAP_DEFAULT_CHARSET )
        ld->ld_lberoptions |= LBER_TRANSLATE_STRINGS;
@@ -226,7 +231,7 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, char *host, int defport,
                                curhost = hostname;
                            }
                            *r++ = '\0';
-                           port = htons( (short)atoi( r ));
+                           port = htons( (short) atoi( r ) );
                        } else {
                            port = defport;   
                        }