Merge remote branch 'origin/mdb.master'

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

diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index 3a05f90c03205f90d706aee1c6790caea3762ca6..7f1f83100261afd615a09b55dfbbef5efad50abe 100644 (file)
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -149,7 +149,7 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
                == AC_SOCKET_ERROR )
        {
                /* XXX: needs to be replace with ber_stream_read() */
-               read(s, &ch, 1);
+               (void)read(s, &ch, 1);
                TRACE;
                return -1;
        }
@@ -234,7 +234,7 @@ sendcred:
                                msg.msg_accrights = (char *)fds;
                                msg.msg_accrightslen = sizeof(int);
 # endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-                               getpeername( s, sa, &salen );
+                               getpeername( s, (struct sockaddr *) sa, &salen );
                                fchmod( fds[0], S_ISUID|S_IRWXU );
                                write( fds[1], sa, salen );
                                sendmsg( s, &msg, 0 );
@@ -319,19 +319,15 @@ sendcred:
 }
 
 int
-ldap_connect_to_path(LDAP *ld, Sockbuf *sb, const char *path, int async)
+ldap_connect_to_path(LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, int async)
 {
        struct sockaddr_un      server;
        ber_socket_t            s;
        int                     rc;
+       const char *path = srv->lud_host;
 
        oslocal_debug(ld, "ldap_connect_to_path\n",0,0,0);
 
-       s = ldap_pvt_socket( ld );
-       if ( s == AC_SOCKET_INVALID ) {
-               return -1;
-       }
-
        if ( path == NULL || path[0] == '\0' ) {
                path = LDAPI_SOCK;
        } else {
@@ -341,6 +337,11 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, const char *path, int async)
                }
        }
 
+       s = ldap_pvt_socket( ld );
+       if ( s == AC_SOCKET_INVALID ) {
+               return -1;
+       }
+
        oslocal_debug(ld, "ldap_connect_to_path: Trying %s\n", path, 0, 0);
 
        memset( &server, '\0', sizeof(server) );
@@ -350,10 +351,7 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, const char *path, int async)
        rc = ldap_pvt_connect(ld, s, &server, async);
 
        if (rc == 0) {
-               int err;
-               err = ldap_int_connect_cbs( ld, sb, &s, path, (struct sockaddr *)&server );
-               if ( err )
-                       rc = err;
+               rc = ldap_int_connect_cbs( ld, sb, &s, srv, (struct sockaddr *)&server );
        }
        if ( rc ) {
                ldap_pvt_close_socket(ld, s);