X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Futil-int.c;h=6b24d63565db919789a1ef4502ba9e1d33a9fc5d;hb=de01a6e3d791d3458549d2ceeccf4d7e0477ff78;hp=4bf3f6fa71e6833f56f0060737fed7dfdbbf8b0b;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap
diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 4bf3f6fa71..6b24d63565 100644
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -1,25 +1,28 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2007 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
+ * .
+ */
+/* 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"
@@ -33,37 +36,45 @@
#include "ldap-int.h"
-#if defined( LDAP_R_COMPILE )
-# include
-#else
-# undef HAVE_REENTRANT_FUNCTIONS
+#ifndef h_errno
+/* newer systems declare this in for you, older ones don't.
+ * harmless to declare it again (unless defined by a macro).
+ */
+extern int h_errno;
#endif
-#if (defined( HAVE_CTIME_R ) || defined( HAVE_REENTRANT_FUNCTIONS)) \
- && defined( CTIME_R_NARGS )
-# define USE_CTIME_R
+#ifdef HAVE_HSTRERROR
+# define HSTRERROR(e) hstrerror(e)
+#else
+# define HSTRERROR(e) hp_strerror(e)
#endif
-#if defined(HAVE_GETHOSTBYNAME_R) && \
- (GETHOSTBYNAME_R_NARGS > 6 || GETHOSTBYNAME_R_NARGS < 5)
- /* Don't know how to handle this version, pretend it's not there */
-# undef HAVE_GETHOSTBYNAME_R
-#endif
-#if defined(HAVE_GETHOSTBYADDR_R) && \
- (GETHOSTBYADDR_R_NARGS > 8 || GETHOSTBYADDR_R_NARGS < 7)
- /* Don't know how to handle this version, pretend it's not there */
-# undef HAVE_GETHOSTBYADDR_R
-#endif
+#ifndef LDAP_R_COMPILE
+# undef HAVE_REENTRANT_FUNCTIONS
+# undef HAVE_CTIME_R
+# undef HAVE_GETHOSTBYNAME_R
+# undef HAVE_GETHOSTBYADDR_R
-#ifdef LDAP_R_COMPILE
-# ifndef USE_CTIME_R
+#else
+# include
+ ldap_pvt_thread_mutex_t ldap_int_resolv_mutex;
+
+# if (defined( HAVE_CTIME_R ) || defined( HAVE_REENTRANT_FUNCTIONS)) \
+ && defined( CTIME_R_NARGS )
+# define USE_CTIME_R
+# else
static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
# endif
-# if !defined( HAVE_GETHOSTBYNAME_R ) || !defined( HAVE_GETHOSTBYADDR_R )
- static ldap_pvt_thread_mutex_t ldap_int_gethostby_mutex;
+
+# if defined(HAVE_GETHOSTBYNAME_R) && \
+ (GETHOSTBYNAME_R_NARGS < 5) || (6 < GETHOSTBYNAME_R_NARGS)
+ /* Don't know how to handle this version, pretend it's not there */
+# undef HAVE_GETHOSTBYNAME_R
# endif
-# ifdef HAVE_RES_QUERY
- ldap_pvt_thread_mutex_t ldap_int_resolv_mutex;
+# if defined(HAVE_GETHOSTBYADDR_R) && \
+ (GETHOSTBYADDR_R_NARGS < 7) || (8 < GETHOSTBYADDR_R_NARGS)
+ /* Don't know how to handle this version, pretend it's not there */
+# undef HAVE_GETHOSTBYADDR_R
# endif
#endif /* LDAP_R_COMPILE */
@@ -81,13 +92,17 @@ char *ldap_pvt_ctime( const time_t *tp, char *buf )
# endif
#else
+
# ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_lock( &ldap_int_ctime_mutex );
# endif
+
AC_MEMCPY( buf, ctime(tp), 26 );
+
# ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_unlock( &ldap_int_ctime_mutex );
# endif
+
return buf;
#endif
}
@@ -95,10 +110,13 @@ char *ldap_pvt_ctime( const time_t *tp, char *buf )
#define BUFSTART (1024-32)
#define BUFMAX (32*1024-32)
+#if defined(LDAP_R_COMPILE)
static char *safe_realloc( char **buf, int len );
-#if !defined(HAVE_GETHOSTBYNAME_R) && defined(LDAP_R_COMPILE)
-static int copy_hostent( struct hostent *res, char **buf, struct hostent * src );
+#if !(defined(HAVE_GETHOSTBYNAME_R) && defined(HAVE_GETHOSTBYADDR_R))
+static int copy_hostent( struct hostent *res,
+ char **buf, struct hostent * src );
+#endif
#endif
int ldap_pvt_gethostbyname_a(
@@ -119,9 +137,8 @@ int ldap_pvt_gethostbyname_a(
return r;
#if (GETHOSTBYNAME_R_NARGS < 6)
- r = ((*result=gethostbyname_r( name, resbuf, *buf,
- buflen, herrno_ptr ))== NULL) ?
- -1 : 0;
+ *result=gethostbyname_r( name, resbuf, *buf, buflen, herrno_ptr );
+ r = (*result == NULL) ? -1 : 0;
#else
r = gethostbyname_r( name, resbuf, *buf,
buflen, result, herrno_ptr );
@@ -148,7 +165,7 @@ int ldap_pvt_gethostbyname_a(
int retval;
*buf = NULL;
- ldap_pvt_thread_mutex_lock( &ldap_int_gethostby_mutex );
+ ldap_pvt_thread_mutex_lock( &ldap_int_resolv_mutex );
he = gethostbyname( name );
@@ -163,7 +180,7 @@ int ldap_pvt_gethostbyname_a(
retval = 0;
}
- ldap_pvt_thread_mutex_unlock( &ldap_int_gethostby_mutex );
+ ldap_pvt_thread_mutex_unlock( &ldap_int_resolv_mutex );
return retval;
#else
@@ -179,7 +196,124 @@ int ldap_pvt_gethostbyname_a(
return -1;
#endif
}
-
+
+#if !defined( HAVE_GETNAMEINFO ) && !defined( HAVE_HSTRERROR )
+static const char *
+hp_strerror( int err )
+{
+ switch (err) {
+ case HOST_NOT_FOUND: return _("Host not found (authoritative)");
+ case TRY_AGAIN: return _("Host not found (server fail?)");
+ case NO_RECOVERY: return _("Non-recoverable failure");
+ case NO_DATA: return _("No data of requested type");
+#ifdef NETDB_INTERNAL
+ case NETDB_INTERNAL: return STRERROR( errno );
+#endif
+ }
+ return _("Unknown resolver error");
+}
+#endif
+
+int ldap_pvt_get_hname(
+ const struct sockaddr *sa,
+ int len,
+ char *name,
+ int namelen,
+ char **err )
+{
+ int rc;
+#if defined( HAVE_GETNAMEINFO )
+
+#if defined( LDAP_R_COMPILE )
+ ldap_pvt_thread_mutex_lock( &ldap_int_resolv_mutex );
+#endif
+ rc = getnameinfo( sa, len, name, namelen, NULL, 0, 0 );
+#if defined( LDAP_R_COMPILE )
+ ldap_pvt_thread_mutex_unlock( &ldap_int_resolv_mutex );
+#endif
+ if ( rc ) *err = (char *)AC_GAI_STRERROR( rc );
+ return rc;
+
+#else /* !HAVE_GETNAMEINFO */
+ char *addr;
+ int alen;
+ struct hostent *hp = NULL;
+#ifdef HAVE_GETHOSTBYADDR_R
+ struct hostent hb;
+ int buflen=BUFSTART, h_errno;
+ char *buf=NULL;
+#endif
+
+#ifdef LDAP_PF_INET6
+ if (sa->sa_family == AF_INET6) {
+ struct sockaddr_in6 *sin = (struct sockaddr_in6 *)sa;
+ addr = (char *)&sin->sin6_addr;
+ alen = sizeof(sin->sin6_addr);
+ } else
+#endif
+ if (sa->sa_family == AF_INET) {
+ struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+ addr = (char *)&sin->sin_addr;
+ alen = sizeof(sin->sin_addr);
+ } else {
+ rc = NO_RECOVERY;
+ *err = (char *)HSTRERROR( rc );
+ return rc;
+ }
+#if defined( HAVE_GETHOSTBYADDR_R )
+ for(;buflensa_family,
+ &hb, buf, buflen, &h_errno );
+ rc = (hp == NULL) ? -1 : 0;
+#else
+ rc = gethostbyaddr_r( addr, alen, sa->sa_family,
+ &hb, buf, buflen,
+ &hp, &h_errno );
+#endif
+#ifdef NETDB_INTERNAL
+ if ((rc<0) &&
+ (h_errno==NETDB_INTERNAL) &&
+ (errno==ERANGE))
+ {
+ buflen*=2;
+ continue;
+ }
+#endif
+ break;
+ }
+ if (hp) {
+ strncpy( name, hp->h_name, namelen );
+ } else {
+ *err = (char *)HSTRERROR( h_errno );
+ }
+ LDAP_FREE(buf);
+#else /* HAVE_GETHOSTBYADDR_R */
+
+#if defined( LDAP_R_COMPILE )
+ ldap_pvt_thread_mutex_lock( &ldap_int_resolv_mutex );
+#endif
+ hp = gethostbyaddr( addr, alen, sa->sa_family );
+ if (hp) {
+ strncpy( name, hp->h_name, namelen );
+ rc = 0;
+ } else {
+ rc = h_errno;
+ *err = (char *)HSTRERROR( h_errno );
+ }
+#if defined( LDAP_R_COMPILE )
+ ldap_pvt_thread_mutex_unlock( &ldap_int_resolv_mutex );
+#endif
+
+#endif /* !HAVE_GETHOSTBYADDR_R */
+ return rc;
+#endif /* !HAVE_GETNAMEINFO */
+}
+
int ldap_pvt_gethostbyaddr_a(
const char *addr,
int len,
@@ -200,10 +334,9 @@ int ldap_pvt_gethostbyaddr_a(
if (safe_realloc( buf, buflen )==NULL)
return r;
#if (GETHOSTBYADDR_R_NARGS < 8)
- r = ((*result=gethostbyaddr_r( addr, len, type,
- resbuf, *buf, buflen,
- herrno_ptr )) == NULL) ?
- -1 : 0;
+ *result=gethostbyaddr_r( addr, len, type,
+ resbuf, *buf, buflen, herrno_ptr );
+ r = (*result == NULL) ? -1 : 0;
#else
r = gethostbyaddr_r( addr, len, type,
resbuf, *buf, buflen,
@@ -229,7 +362,7 @@ int ldap_pvt_gethostbyaddr_a(
int retval;
*buf = NULL;
- ldap_pvt_thread_mutex_lock( &ldap_int_gethostby_mutex );
+ ldap_pvt_thread_mutex_lock( &ldap_int_resolv_mutex );
he = gethostbyaddr( addr, len, type );
@@ -244,9 +377,10 @@ int ldap_pvt_gethostbyaddr_a(
retval = 0;
}
- ldap_pvt_thread_mutex_unlock( &ldap_int_gethostby_mutex );
+ ldap_pvt_thread_mutex_unlock( &ldap_int_resolv_mutex );
- return retval;
+ return retval;
+
#else /* gethostbyaddr() */
*buf = NULL;
*result = gethostbyaddr( addr, len, type );
@@ -269,28 +403,27 @@ void ldap_int_utils_init( void )
done=1;
#ifdef LDAP_R_COMPILE
-
#if !defined( USE_CTIME_R ) && !defined( HAVE_REENTRANT_FUNCTIONS )
ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex );
#endif
+ ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex );
-#if !defined( HAVE_GETHOSTBYNAME_R ) || !defined( HAVE_GETHOSTBYADDR_R )
- ldap_pvt_thread_mutex_init( &ldap_int_gethostby_mutex );
+#ifdef HAVE_CYRUS_SASL
+ ldap_pvt_thread_mutex_init( &ldap_int_sasl_mutex );
#endif
-
-#ifdef HAVE_RES_QUERY
- ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex );
#endif
/* call other module init functions here... */
-#endif
}
#if defined( NEED_COPY_HOSTENT )
# undef NEED_SAFE_REALLOC
#define NEED_SAFE_REALLOC
-static char *cpy_aliases( char ***tgtio, char *buf, char **src )
+static char *cpy_aliases(
+ char ***tgtio,
+ char *buf,
+ char **src )
{
int len;
char **tgt=*tgtio;
@@ -304,7 +437,11 @@ static char *cpy_aliases( char ***tgtio, char *buf, char **src )
return buf;
}
-static char *cpy_addresses( char ***tgtio, char *buf, char **src, int len )
+static char *cpy_addresses(
+ char ***tgtio,
+ char *buf,
+ char **src,
+ int len )
{
char **tgt=*tgtio;
for( ; (*src) ; src++ ) {
@@ -316,7 +453,10 @@ static char *cpy_addresses( char ***tgtio, char *buf, char **src, int len )
return buf;
}
-static int copy_hostent( struct hostent *res, char **buf, struct hostent * src )
+static int copy_hostent(
+ struct hostent *res,
+ char **buf,
+ struct hostent * src )
{
char **p;
char **tp;
@@ -325,7 +465,7 @@ static int copy_hostent( struct hostent *res, char **buf, struct hostent * src )
int n_alias=0;
int total_alias_len=0;
int n_addr=0;
- int total_addr_len;
+ int total_addr_len=0;
int total_len;
/* calculate the size needed for the buffer */
@@ -414,27 +554,28 @@ char * ldap_pvt_get_fqdn( char *name )
return fqdn;
}
-#if defined( HAVE_GETADDRINFO ) && !defined( HAVE_GAI_STRERROR )
+#if ( defined( HAVE_GETADDRINFO ) || defined( HAVE_GETNAMEINFO ) ) \
+ && !defined( HAVE_GAI_STRERROR )
char *ldap_pvt_gai_strerror (int code) {
static struct {
int code;
const char *msg;
} values[] = {
#ifdef EAI_ADDRFAMILY
- { EAI_ADDRFAMILY, "Address family for hostname not supported" },
+ { EAI_ADDRFAMILY, N_("Address family for hostname not supported") },
#endif
- { EAI_AGAIN, "Temporary failure in name resolution" },
- { EAI_BADFLAGS, "Bad value for ai_flags" },
- { EAI_FAIL, "Non-recoverable failure in name resolution" },
- { EAI_FAMILY, "ai_family not supported" },
- { EAI_MEMORY, "Memory allocation failure" },
+ { EAI_AGAIN, N_("Temporary failure in name resolution") },
+ { EAI_BADFLAGS, N_("Bad value for ai_flags") },
+ { EAI_FAIL, N_("Non-recoverable failure in name resolution") },
+ { EAI_FAMILY, N_("ai_family not supported") },
+ { EAI_MEMORY, N_("Memory allocation failure") },
#ifdef EAI_NODATA
- { EAI_NODATA, "No address associated with hostname" },
+ { EAI_NODATA, N_("No address associated with hostname") },
#endif
- { EAI_NONAME, "Name or service not known" },
- { EAI_SERVICE, "Servname not supported for ai_socktype" },
- { EAI_SOCKTYPE, "ai_socktype not supported" },
- { EAI_SYSTEM, "System error" },
+ { EAI_NONAME, N_("Name or service not known") },
+ { EAI_SERVICE, N_("Servname not supported for ai_socktype") },
+ { EAI_SOCKTYPE, N_("ai_socktype not supported") },
+ { EAI_SYSTEM, N_("System error") },
{ 0, NULL }
};
@@ -442,10 +583,10 @@ char *ldap_pvt_gai_strerror (int code) {
for ( i = 0; values[i].msg != NULL; i++ ) {
if ( values[i].code == code ) {
- return (char *) values[i].msg;
+ return (char *) _(values[i].msg);
}
}
- return "Unknown error";
+ return _("Unknown error");
}
#endif