Updates for MSVC 5.0. Fix libraries names to be ol{ber,dap,..}32.lib.

[openldap] / libraries / libldap / cldap.c

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index adc2f9de3ba201fb65218f0daf456c18927d5dce..d5ca787bd3eee1750ed26bed7a507060d4ff1b4d 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1990, 1994 Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -9,10 +13,6 @@
 
 #ifdef LDAP_CONNECTIONLESS
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990, 1994 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -64,7 +64,7 @@ cldap_open( char *host, int port )
     char               *p;
     int                        i;
 
-    /* buffers for ldap_int_gethostbyname_a ... */
+    /* buffers for ldap_pvt_gethostbyname_a ... */
     struct hostent      he_buf;
     int                 local_h_errno;
     char               *ha_buf=NULL;
@@ -117,7 +117,7 @@ cldap_open( char *host, int port )
            /* 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)) {
                   errno = EHOSTUNREACH;
@@ -143,7 +143,7 @@ cldap_open( char *host, int port )
            }
 
            if ( ld->ld_host == NULL ) {
-                   ld->ld_host = ldap_strdup( host );
+                   ld->ld_host = strdup( host );
            }
        }
     } else {