Provide framework for ldap_r and reentrant/thread safety levels.

  -lldap_r can now be implemented...

diff --git a/acconfig.h b/acconfig.h
index 6c85b29c28e1244d995e2092640b786f423a0225..686ef47bf969a8363bf7bb3543931b42d746f3a8 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -174,6 +174,8 @@
 
 /* These are defined in ldap_features.h */
 /*
+       LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
+       LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
        LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
        LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 */

diff --git a/build/lib.mk b/build/lib.mk
index d92d72503dfcf316ddec72a88bf27a68cfcbc1df..955a67d859c9a0e499fa4ee91efda5c4104cea15 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -23,11 +23,11 @@ lint5: lint5-local FORCE
 
 clean-common:  FORCE
        $(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
-               $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
+               $(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \
                *.o *.lo a.out core version.c .libs/*
 
 depend-common: FORCE
-       $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
+       $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
 
 lint-local: FORCE
 lint5-local: FORCE

diff --git a/configure b/configure
index 31c55b2c5edd46c3cdca53843a3a30e5ba11bef3..8fae4241231f9fb2c3ff3079e7ae3301472a8220 100755 (executable)
--- a/configure
+++ b/configure
@@ -7779,11 +7779,9 @@ fi
 
 for ac_func in \
        bcopy                   \
-       ctime_r                 \
        flock                   \
        getdtablesize   \
        gethostname             \
-       gethostbyaddr_r gethostbyname_r \
        getpwuid                \
        gettimeofday    \
        lockf                   \
@@ -7804,7 +7802,6 @@ for ac_func in \
        strsep                  \
        strstr                  \
        strtok                  \
-       strtok_r                \
        strtol                  \
        strtoul                 \
        sysconf                 \
@@ -7812,12 +7809,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7816: checking for $ac_func" >&5
+echo "configure:7813: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7821 "configure"
+#line 7818 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7840,7 +7837,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7865,15 +7862,96 @@ fi
 done
 
 
+# these functions are required to build a thread_safe -lldap
+for ac_func in \
+       strtok_r                \
+       ctime_r                 \
+       gethostbyaddr_r \
+       gethostbyname_r \
+
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:7875: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 7880 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:7903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+if test $ac_cv_func_strtok_r = yes \
+       -a $ac_cv_func_ctime_r = yes \
+       -a $ac_cv_func_gethostbyaddr_r = yes \
+       -a $ac_cv_func_gethostbyname_r = yes \
+       ; then
+
+       cat >> confdefs.h <<\EOF
+#define LDAP_API_FEATURE_X_OPENLDAP_REENTRANT 1
+EOF
+
+fi
+
+if test $ol_link_threads != no ; then
+       cat >> confdefs.h <<\EOF
+#define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
+EOF
+
+fi
+
 for ac_func in getopt strdup tempnam
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7872: checking for $ac_func" >&5
+echo "configure:7950: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7877 "configure"
+#line 7955 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7896,7 +7974,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7926,13 +8004,13 @@ done
 # Check Configuration
 
 echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
-echo "configure:7930: checking declaration of sys_errlist" >&5
+echo "configure:8008: checking declaration of sys_errlist" >&5
 if eval "test \"`echo '$''{'ol_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
        cat > conftest.$ac_ext <<EOF
-#line 7936 "configure"
+#line 8014 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7942,7 +8020,7 @@ int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:7946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ol_cv_dcl_sys_errlist=yes
 else
@@ -7963,20 +8041,20 @@ if test $ol_cv_dcl_sys_errlist = no ; then
 EOF
 
        echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
-echo "configure:7967: checking existence of sys_errlist" >&5
+echo "configure:8045: checking existence of sys_errlist" >&5
        if eval "test \"`echo '$''{'ol_cv_have_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                cat > conftest.$ac_ext <<EOF
-#line 7973 "configure"
+#line 8051 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:7980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ol_cv_have_sys_errlist=yes
 else

diff --git a/configure.in b/configure.in
index d7de1b6f206c923ebc52b15ca289a616521403be..f33d501642669273076d81c1ae9a5c486735567d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -808,13 +808,33 @@ dnl               #if defined( HAVE_REENTRANT_FUNCTIONS ) \
 dnl                    || defined( HAVE_FUNC_R )
 dnl                    func_r(...);
 dnl            #else
-dnl                    func(...);
+dnl            #       if defined( HAVE_THREADS ) 
+dnl                            /* lock */
+dnl            #       endif
+dnl                            func(...);
+dnl            #       if defined( HAVE_THREADS ) 
+dnl                            /* unlock */
+dnl            #       endif
 dnl            #endif
 dnl
 dnl HAVE_REENTRANT_FUNCTIONS is derived from:
 dnl            _POSIX_REENTRANT_FUNCTIONS
 dnl            _POSIX_THREAD_SAFE_FUNCTIONS
 dnl            _POSIX_THREADSAFE_FUNCTIONS
+dnl
+dnl            and is currently defined in lthread.h
+dnl
+dnl HAVE_THREADS is defined by lthread.h iff -UNO_THREADS
+dnl 
+dnl libldap/*.c should only include <lthread.h> iff
+dnl LDAP_R_COMPILE is defined.  ie:
+dnl            #ifdef LDAP_R_COMPILE
+dnl            #       include LDAP_R_COMPILE
+dnl            #endif
+dnl
+dnl LDAP_R_COMIPLE is defined by libldap_r/Makefile.in
+dnl specifically for compiling the threadsafe version of
+dnl    the ldap library (-lldap_r).
 dnl            
 dnl    dnl check for reentrant/threadsafe functions
 dnl    dnl
@@ -1116,11 +1136,9 @@ AC_FUNC_WAIT3
 
 AC_CHECK_FUNCS(                \
        bcopy                   \
-       ctime_r                 \
        flock                   \
        getdtablesize   \
        gethostname             \
-       gethostbyaddr_r gethostbyname_r \
        getpwuid                \
        gettimeofday    \
        lockf                   \
@@ -1141,13 +1159,33 @@ AC_CHECK_FUNCS(         \
        strsep                  \
        strstr                  \
        strtok                  \
-       strtok_r                \
        strtol                  \
        strtoul                 \
        sysconf                 \
        waitpid                 \
 )
 
+# these functions are required to build a thread_safe -lldap
+AC_CHECK_FUNCS(                \
+       strtok_r                \
+       ctime_r                 \
+       gethostbyaddr_r \
+       gethostbyname_r \
+)
+
+if test $ac_cv_func_strtok_r = yes \
+       -a $ac_cv_func_ctime_r = yes \
+       -a $ac_cv_func_gethostbyaddr_r = yes \
+       -a $ac_cv_func_gethostbyname_r = yes \
+       ; then
+
+       AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT, 1)
+fi
+
+if test $ol_link_threads != no ; then
+       AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE, 1)
+fi
+
 dnl We actually may need to replace more than this.
 AC_REPLACE_FUNCS(getopt strdup tempnam)
 

diff --git a/include/ldap.h b/include/ldap.h
index 5a53ef2c1da2592590d5b6388767ffcb2f07a8e1..5fb02d29d055b5d96a2f2284fddef08caae86f10 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -40,6 +40,19 @@ LDAP_BEGIN_DECL
 /* include LDAP_API_FEATURE defines */
 #include <ldap_features.h>
 
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT ) || \
+       ( defined( LDAP_THREAD_SAFE ) && \
+               defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) )
+       /* -lldap may or may not be thread safe */
+       /* -lldap_r, if available, is always thread safe */
+#      define  LDAP_API_FEATURE_THREAD_SAFE 1
+#endif
+#if defined( LDAP_THREAD_SAFE ) && \
+       defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE )
+/* #define LDAP_API_FEATURE_SESSION_SAFE       1       */
+/* #define LDAP_API_OPERATION_SESSION_SAFE     1       */
+#endif
+
 #define LDAP_COMPAT20
 #define LDAP_COMPAT30
 #if defined(LDAP_COMPAT20) || defined(LDAP_COMPAT30)

diff --git a/include/ldap_features.h.in b/include/ldap_features.h.in
index 105aaeb495675ffd0737d2e0171f7cc976506c4e..e3f273f8ff16c01f2953fd79e5d3a9eaa928231c 100644 (file)
--- a/include/ldap_features.h.in
+++ b/include/ldap_features.h.in
@@ -4,6 +4,39 @@
 #ifndef _LDAP_FEATURES_H
 #define _LDAP_FEATURES_H 1
 
+/*
+** OpenLDAP reentrancy/thread-safeness should be dynamically
+** checked using ldap_get_option().
+**
+** The -lldap implementation may or may not be:
+**             LDAP_API_FEATURE_THREAD_SAFE
+**
+** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_REENTRANT can
+** be used to determine if -lldap is LDAP_API_FEATURE_THREAD_SAFE at
+** compile time.
+**
+** The -lldap_r implementation is always THREAD_SAFE but
+** may also be:
+**             LDAP_API_FEATURE_SESSION_THREAD_SAFE
+**             LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+**
+** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+** can be used to determine if -lldap_r is availalbe at compile
+** time.  You must define LDAP_THREAD_SAFE if and only if you
+** link with -lldap_r.
+**
+** If you fail to define LDAP_THREAD_SAFE when linking with
+** -lldap_r or define LDAP_THREAD_SAFE when linking with -lldap,
+** provided header definations and declarations may be incorrect.
+**
+*/
+
+/* is -lldap reentrant or not */
+#undef LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
+
+/* is threadsafe version of -lldap (ie: -lldap_r) *available* or not */
+#undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+
 /* LDAP v2 DNS */
 #undef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
 

diff --git a/include/lthread.h b/include/lthread.h
index 3485406d93652ba0626294d9a6ee8211eef6200f..b33900f98c5983b8f4b8889a60d650954bf274ce 100644 (file)
--- a/include/lthread.h
+++ b/include/lthread.h
@@ -19,6 +19,12 @@
 
 LDAP_BEGIN_DECL
 
+#if defined( _POSIX_REENTRANT_FUNCTIONS ) || \
+       defined( _POSIX_THREAD_SAFE_FUNCTIONS ) || \
+       defined( _POSIX_THREAD_SAFE_FUNCTIONS )
+#define HAVE_REENTRANT_FUNCTIONS 1
+#endif
+
 #if !defined( HAVE_PTHREAD_ATTR_INIT ) && \
        defined( HAVE_PTHREAD_ATTR_CREATE )
 #define pthread_attr_init( a )         pthread_attr_create( a )
@@ -103,6 +109,8 @@ LDAP_END_DECL
 
 LDAP_BEGIN_DECL
 
+#define HAVE_REENTRANT_FUNCTIONS 1
+
 typedef void   *(*VFP)();
 
 /* default attr states */
@@ -145,6 +153,8 @@ LDAP_END_DECL
 
 LDAP_BEGIN_DECL
 
+#define HAVE_REENTRANT_FUNCTIONS 1
+
 stkalign_t *get_stack( int *stacknop );
 void free_stack( int *stackno );
 
@@ -265,4 +275,9 @@ typedef int pthread_cond_t;
 LDAP_END_DECL
 
 #endif /* no threads support */
+
+#ifndef NO_THREADS
+#      define HAVE_THREADS 1
+#endif
+
 #endif /* _LTHREAD_H */

diff --git a/include/portable.h.in b/include/portable.h.in
index f4785d5f917e974d305085a8ffbd67be105009a4..d2c7f0996d8d14800056e68465150951838b4045 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -263,6 +263,8 @@ is provided ``as is'' without express or implied warranty.
 
 /* These are defined in ldap_features.h */
 /*
+ LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
+ LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
  LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
  LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 */

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 68c8c5b245dc77d1e9784afc2a46ec7b784a8344..7948578895fe4aa2562c13d5a3808b3c83332733 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -8,11 +8,13 @@
 #ifndef        _LDAP_INT_H
 #define        _LDAP_INT_H 1
 
+#ifdef LDAP_COMPILING_R
+#define LDAP_THREAD_SAFE 1
+#endif
+
 #include "../liblber/lber-int.h"
 #include "ldap_log.h"
 #include "ldap.h"
-#include <time.h>
-#include <netdb.h>
 
 LDAP_BEGIN_DECL
 
@@ -280,6 +282,8 @@ int ldap_8859_to_t61( char **bufp, unsigned long *buflenp, int free_input );
  * 
  */
 
+struct hostent;        /* avoid pulling in <netdb.h> */
+
 extern char *ldap_int_strtok( char *str, const char *delim, char **pos );
 extern char *ldap_int_ctime( const time_t *tp, char *buf );
 extern int ldap_int_gethostbyname_a(

diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
index 07374e228c011b0b2d195c28265331100a363113..c595972bc2c415bc427efd1d67402d5ad825cd7d 100644 (file)
--- a/libraries/libldap/options.c
+++ b/libraries/libldap/options.c
@@ -9,6 +9,22 @@
 #include "ldap-int.h"
 
 static const char* features[] = {
+#ifdef LDAP_API_FEATURE_THREAD_SAFE
+       "THREAD_SAFE",
+#endif
+#ifdef LDAP_API_FEATURE_SESSION_THREAD_SAFE
+       "SESSION_THREAD_SAFE",
+#endif
+#ifdef LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+       "OPERATION_THREAD_SAFE",
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_REEENTRANT
+       "X_OPENLDAP_REENTRANT",
+#endif
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) && \
+       defined( LDAP_THREAD_SAFE )
+       "X_OPENLDAP_THREAD_SAFE",
+#endif
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
        "X_OPENLDAP_V2_DNS",
 #endif

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index 9706efb868dc166c325b6bb625b4a618e1e739a4..f5a28dba9a9d4cdf0f4141c830adfbd71563d117 100644 (file)
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -4,12 +4,10 @@
 LIBRARY = libldap_r.la
 XLIBRARY = ../libldap_r.a
 
-XDIR = ../libldap
-XDEFS = -DLDAP_THREAD_SAFE -I$(XDIR)
-
 PROGRAMS = apitest ltest ttest
 
-XSRCS  = apitest.c test.c tmpltest.c \
+XXDIR = ../libldap
+XXSRCS = apitest.c test.c tmpltest.c \
        bind.c open.c result.c error.c compare.c search.c \
        modify.c add.c modrdn.c delete.c abandon.c ufn.c cache.c \
        getfilter.c sbind.c kbind.c unbind.c friendly.c cldap.c \
@@ -28,19 +26,22 @@ OBJS        = bind.lo open.lo result.lo error.lo compare.lo search.lo \
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
+XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
 LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS)
 
-.links :
-       @for i in $(XSRCS); do \
+.links : FORCE
+       @for i in $(XXSRCS); do \
                $(RM) $$i ; \
-               $(LN_S) $(XDIR)/$$i . ; \
+               $(LN_S) $(XXDIR)/$$i . ; \
        done
        touch .links
 
-$(XSRCS) : .links
+$(XXSRCS) : .links
 
 clean-local: FORCE
-       $(RM) .links
+       @$(RM) .links
+
+depend-common: .links
 
 apitest:       $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
        $(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)