Added libldap cert check extension (ITS#3134)

[openldap] / libraries / libldap / util-int.c

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 96d1fe14e876877961b1143a969c4fb96a57b36b..8969ebe175a17b0ef23b8c11e90c13d7db1185f4 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -1,25 +1,28 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1998 A. Hartgers.
+ * 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>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Bart Hartgers for inclusion in
+ * OpenLDAP Software.
  */
+
 /*
  * util-int.c  Various functions to replace missing threadsafe ones.
- *                               Without the real *_r funcs, things will
- *                               work, but might not be threadsafe. 
- * 
- * Written by Bart Hartgers.
- *
- * Copyright 1998, A. Hartgers, All rights reserved.
- * This software is not subject to any license of Eindhoven University of
- * Technology, since it was written in my spare time.
- *                     
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
- */ 
-
+ *                             Without the real *_r funcs, things will
+ *                             work, but might not be threadsafe. 
+ */
 
 #include "portable.h"
 
@@ -220,7 +223,7 @@ int ldap_pvt_get_hname(
 #if defined( LDAP_R_COMPILE )
        ldap_pvt_thread_mutex_unlock( &ldap_int_resolv_mutex );
 #endif
-       if ( rc ) *err = AC_GAI_STRERROR( rc );
+       if ( rc ) *err = (char *)AC_GAI_STRERROR( rc );
        return rc;
 
 #else /* !HAVE_GETNAMEINFO */
@@ -396,6 +399,10 @@ void ldap_int_utils_init( void )
        ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex );
 #endif
        ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex );
+
+#ifdef HAVE_CYRUS_SASL
+       ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
+#endif
 #endif
 
        /* call other module init functions here... */