X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fos-local.c;h=8b3da9f2285d919e42e786f8f973b2b649f404b2;hb=70092b38fb23b9141a2b8414fb5a9c5200f3c12d;hp=6d45b2589a111fba9fb82edd9fff1e1e26482c76;hpb=a56c161bdbc1443808039d0eaf9b84474a243352;p=openldap

diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index 6d45b2589a..8b3da9f228 100644
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -13,7 +13,7 @@
 
 #include "portable.h"
 
-#ifdef LDAP_PF_UNIX
+#ifdef LDAP_PF_LOCAL
 
 #include <stdio.h>
 
@@ -33,6 +33,7 @@
 #endif /* HAVE_IO_H */
 
 #include "ldap-int.h"
+#include "ldap_defaults.h"
 
 /* int ldap_int_tblsize = 0; */
 
@@ -64,7 +65,7 @@ ldap_pvt_ndelay_off(LDAP *ld, int fd)
 static ber_socket_t
 ldap_pvt_socket(LDAP *ld)
 {
-	ber_socket_t s = socket(AF_UNIX, SOCK_STREAM, 0);
+	ber_socket_t s = socket(PF_LOCAL, SOCK_STREAM, 0);
 	oslocal_debug(ld, "ldap_new_socket: %d\n",s,0,0);
 	return ( s );
 }
@@ -82,7 +83,7 @@ ldap_pvt_close_socket(LDAP *ld, int s)
 		"ldap_is_socket_ready: errror on socket %d: errno: %d (%s)\n", \
 		s, \
 		errno, \
-		strerror(errno) ); \
+		STRERROR(errno) ); \
 } while( 0 )
 
 /*
@@ -96,8 +97,10 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #if defined( notyet ) /* && defined( SO_ERROR ) */
 {
 	int so_errno;
-	int dummy = sizeof(so_errno);
-	if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy ) == -1 ) {
+	socklen_t dummy = sizeof(so_errno);
+	if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy )
+		== AC_SOCKET_ERROR )
+	{
 		return -1;
 	}
 	if ( so_errno ) {
@@ -110,10 +113,12 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #else
 {
 	/* error slippery */
-	struct sockaddr_un sun;
+	struct sockaddr_un sa;
 	char ch;
-	int dummy = sizeof(sun);
-	if ( getpeername( s, (struct sockaddr *) &sun, &dummy ) == -1 ) {
+	socklen_t dummy = sizeof(sa);
+	if ( getpeername( s, (struct sockaddr *) &sa, &dummy )
+		== AC_SOCKET_ERROR )
+	{
 		/* XXX: needs to be replace with ber_stream_read() */
 		read(s, &ch, 1);
 		TRACE;
@@ -127,7 +132,7 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #undef TRACE
 
 static int
-ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sun, int async)
+ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sa, int async)
 {
 	struct timeval	tv, *opt_tv=NULL;
 	fd_set		wfds, *z=NULL;
@@ -143,10 +148,12 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sun, int async)
 	if ( ldap_pvt_ndelay_on(ld, s) == -1 )
 		return ( -1 );
 
-	if ( connect(s, (struct sockaddr *) sun, sizeof(struct sockaddr_un)) == 0 )
+	if ( connect(s, (struct sockaddr *) sa, sizeof(struct sockaddr_un))
+		!= AC_SOCKET_ERROR )
 	{
-		if ( ldap_pvt_ndelay_off(ld, s) == -1 )
+		if ( ldap_pvt_ndelay_off(ld, s) == -1 ) {
 			return ( -1 );
+		}
 		return ( 0 );
 	}
 
@@ -161,8 +168,11 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sun, int async)
 	FD_ZERO(&wfds);
 	FD_SET(s, &wfds );
 
-	if ( select(ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL) == -1)
+	if ( select(ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL)
+		== AC_SOCKET_ERROR )
+	{
 		return ( -1 );
+	}
 
 	if ( FD_ISSET(s, &wfds) ) {
 		if ( ldap_pvt_is_socket_ready(ld, s) == -1 )
@@ -180,18 +190,18 @@ int
 ldap_connect_to_path(LDAP *ld, Sockbuf *sb, const char *path, int async)
 {
 	struct sockaddr_un	server;
-	ber_socket_t		s = AC_SOCKET_INVALID;
-	int			rc, i, len;
-	char   			*ha_buf=NULL, *p, *q;
+	ber_socket_t		s;
+	int			rc;
 
 	oslocal_debug(ld, "ldap_connect_to_path\n",0,0,0);
 
-	if ( (s = ldap_pvt_socket( ld )) == -1 ) {
+	s = ldap_pvt_socket( ld );
+	if ( s == AC_SOCKET_INVALID ) {
 		return -1;
 	}
 
 	if ( path == NULL || path[0] == '\0' ) {
-		path = "/tmp/.ldap-sock";
+		path = LDAPI_SOCK;
 	} else {
 		if ( strlen(path) > (sizeof( server.sun_path ) - 1) ) {
 			ldap_pvt_set_errno( ENAMETOOLONG );
@@ -202,7 +212,7 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, const char *path, int async)
 	oslocal_debug(ld, "ldap_connect_to_path: Trying %s\n", path, 0, 0);
 
 	memset( &server, '\0', sizeof(server) );
-	server.sun_family = AF_UNIX;
+	server.sun_family = AF_LOCAL;
 	strcpy( server.sun_path, path );
 
 	rc = ldap_pvt_connect(ld, s, &server, async);
@@ -216,4 +226,4 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, const char *path, int async)
 }
 #else
 static int dummy;
-#endif /* LDAP_PF_UNIX */
+#endif /* LDAP_PF_LOCAL */