Merge remote branch 'origin/mdb.master'

[openldap] / libraries / liblutil / sockpair.c

diff --git a/libraries/liblutil/sockpair.c b/libraries/liblutil/sockpair.c
index e831408c4aef65c4ceac1fa642dfea2c9de04963..b351f0a8a57d28387b32c3baf8229d3155e52e4d 100644 (file)
--- a/libraries/liblutil/sockpair.c
+++ b/libraries/liblutil/sockpair.c
@@ -1,7 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 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"
@@ -26,7 +35,8 @@ int lutil_pair( ber_socket_t sds[2] )
        return pipe( sds );
 #else
        struct sockaddr_in si;
-       int rc, len = sizeof(si);
+       int rc;
+       ber_socklen_t len = sizeof(si);
        ber_socket_t sd;
 
        sd = socket( AF_INET, SOCK_DGRAM, 0 );