Move ldap_utf8_*() declarations from ldap-int.h to ldap_pvt.h.

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

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 2eb1c02eff228ad67b32453ea7679677b77770d7..890bd94625d85b077a199b524a55e6de3556b318 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -117,8 +117,13 @@ ldap_pvt_prepare_socket(LDAP *ld, int fd)
 #ifdef TCP_NODELAY
 {
        int dummy = 1;
-       if ( setsockopt( fd, IPPROTO_TCP, TCP_NODELAY, (char*) &dummy, sizeof(dummy) ) == -1 )
-               return -1;
+       if ( setsockopt( fd, IPPROTO_TCP, TCP_NODELAY,
+               (char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR )
+       {
+               osip_debug(ld, "ldap_prepare_socket: "
+                       "setsockopt(%d, TCP_NODELAY) failed (ignored).\n",
+                       fd, 0, 0);
+       }
 }
 #endif
        return 0;
@@ -298,9 +303,9 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, const char *host,
                (void)memset((char *)&sin, 0, sizeof(struct sockaddr_in));
                sin.sin_family = AF_INET;
                sin.sin_port = port;
-               p = (char *)&sin.sin_addr.s_addr;
+               p = (char *)&sin.sin_addr;
                q = use_hp ? (char *)hp->h_addr_list[i] : (char *)&address;
-               SAFEMEMCPY(p, q, sizeof(p) );
+               SAFEMEMCPY(p, q, sizeof(sin.sin_addr) );
 
                osip_debug(ld, "ldap_connect_to_host: Trying %s:%d\n", 
                                inet_ntoa(sin.sin_addr),ntohs(sin.sin_port),0);
@@ -328,12 +333,11 @@ ldap_close_connection( Sockbuf *sb )
 }
 
 
-#if defined( HAVE_KERBEROS ) || defined( HAVE_TLS )
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND ) || defined( HAVE_TLS ) || defined( HAVE_CYRUS_SASL )
 char *
 ldap_host_connected_to( Sockbuf *sb )
 {
        struct hostent          *hp;
-       char                    *p;
        socklen_t               len;
        struct sockaddr_in      sin;
 
@@ -370,7 +374,7 @@ ldap_host_connected_to( Sockbuf *sb )
 }
 #undef DO_RETURN   
    
-#endif /* HAVE_KERBEROS || HAVE_TLS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND || HAVE_TLS */
 
 
 /* for UNIX */