X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblutil%2Fsockpair.c;h=c2e62200355b60e492a42924a6ad546871824bfd;hb=c3e28a5488a8011ef0352f48fca85c48679205ba;hp=b8c7b2bd251b61239abece094cb51bfafc713e2a;hpb=683ea591f75e77077d077f69acbbea53166d6b09;p=openldap

diff --git a/libraries/liblutil/sockpair.c b/libraries/liblutil/sockpair.c
index b8c7b2bd25..c2e6220035 100644
--- a/libraries/liblutil/sockpair.c
+++ b/libraries/liblutil/sockpair.c
@@ -1,6 +1,16 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -19,20 +29,21 @@
  * this function is best implemented using a single pipe() call.
  */
 
-int lutil_pair( LBER_SOCKET_T sds[2] )
+int lutil_pair( ber_socket_t sds[2] )
 {
 #ifdef USE_PIPE
 	return pipe( sds );
 #else
 	struct sockaddr_in si;
 	int rc, len = sizeof(si);
-	LBER_SOCKET_T sd;
+	ber_socket_t sd;
 
 	sd = socket( AF_INET, SOCK_DGRAM, 0 );
-	if ( sd == AC_SOCKET_INVALID )
+	if ( sd == AC_SOCKET_INVALID ) {
 		return sd;
+	}
 	
-	(void) memset( (void*) &si, 0, len );
+	(void) memset( (void*) &si, '\0', len );
 	si.sin_family = AF_INET;
 	si.sin_port = 0;
 	si.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
@@ -55,7 +66,12 @@ int lutil_pair( LBER_SOCKET_T sds[2] )
 		return rc;
 	}
 
-	sds[0] = sds[1] = sd;
+	sds[0] = sd;
+#if !HAVE_WINSOCK
+	sds[1] = dup( sds[0] );
+#else
+	sds[1] = sds[0];
+#endif
 	return 0;
 #endif
 }