Don't provide ldap.OpenLDAP.org and dc=OpenLDAP, dc=Org as the defaults.

[openldap] / libraries / libldap / os-ip.c

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 46ab3a6d5aafc5abd37224144255bb6db541b475..6d501565a9ef759a4b3496509bc0cd0e50683fc1 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1995 Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -49,7 +53,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
 #endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 #endif /* notyet */
    
-       /* buffers for ldap_int_gethostbyname_a */
+       /* buffers for ldap_pvt_gethostbyname_a */
        struct hostent          he_buf;
        int                     local_h_errno;
        char                    *ha_buf=NULL;
@@ -65,7 +69,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
            /* This was just a test for -1 until OSF1 let inet_addr return
               unsigned int, which is narrower than 'unsigned long address' */
            if ( address == 0xffffffff || address == (unsigned long) -1 ) {
-               if ( ( ldap_int_gethostbyname_a( host, &he_buf, &ha_buf,
+               if ( ( ldap_pvt_gethostbyname_a( host, &he_buf, &ha_buf,
                        &hp, &local_h_errno) < 0) || (hp==NULL))
                {
 #ifdef HAVE_WINSOCK
@@ -194,13 +198,13 @@ ldap_host_connected_to( Sockbuf *sb )
         * this is necessary for kerberos to work right, since the official
         * hostname is used as the kerberos instance.
         */
-       if ((ldap_int_gethostbyaddr_a( (char *) &sin.sin_addr,
+       if ((ldap_pvt_gethostbyaddr_a( (char *) &sin.sin_addr,
                sizeof( sin.sin_addr ), 
                AF_INET, &he_buf, &ha_buf,
                &hp,&local_h_errno ) ==0 ) && (hp != NULL) )
        {
                if ( hp->h_name != NULL ) {
-                       DO_RETURN( ldap_strdup( hp->h_name ));
+                       DO_RETURN( strdup( hp->h_name ));
                }
        }