diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-17 14:13:17 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-17 14:13:17 +0000 |
| commit | 198b9cdb023374fb47f91f5503655ca14b805a5f (patch) | |
| tree | 58895dcecdffcb555e723bd036cabd118390382e /ldap-nss.c | |
| parent | 42688c3b7d616c8dc221a76b1cf2155d336db954 (diff) | |
get rid of ltf files (which contain NPL licenced code btw) clean up includes and general small code cleanups
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@19 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'ldap-nss.c')
| -rw-r--r-- | ldap-nss.c | 27 |
1 files changed, 5 insertions, 22 deletions
@@ -25,16 +25,6 @@ #include "config.h" -#ifdef HAVE_PORT_BEFORE_H -#include <port_before.h> -#endif - -#if defined(HAVE_THREAD_H) -#include <thread.h> -#elif defined(HAVE_PTHREAD_H) -#include <pthread.h> -#endif - #include <assert.h> #include <stdlib.h> #include <unistd.h> @@ -72,14 +62,17 @@ #ifdef HAVE_MALLOC_H #include <malloc.h> #endif - +#if defined(HAVE_THREAD_H) +#include <thread.h> +#elif defined(HAVE_PTHREAD_H) +#include <pthread.h> +#endif /* Try to handle systems with both SASL libraries installed */ #if defined(HAVE_SASL_SASL_H) && defined(HAVE_SASL_AUXPROP_REQUEST) #include <sasl/sasl.h> #elif defined(HAVE_SASL_H) #include <sasl.h> #endif - #ifdef HAVE_GSSAPI_H #include <gssapi.h> #elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H) @@ -88,7 +81,6 @@ #endif #include "ldap-nss.h" -#include "ltf.h" #include "util.h" #include "dnsconfig.h" #include "pagectrl.h" @@ -1512,15 +1504,6 @@ do_open (void) cfg = __session.ls_config; -#ifdef LDAP_OPT_THREAD_FN_PTRS - if (_nss_ldap_ltf_thread_init (__session.ls_conn) != NSS_STATUS_SUCCESS) - { - do_close (); - debug ("<== do_open (thread initialization failed)"); - return NSS_STATUS_UNAVAIL; - } -#endif /* LDAP_OPT_THREAD_FN_PTRS */ - #if LDAP_SET_REBIND_PROC_ARGS == 3 ldap_set_rebind_proc (__session.ls_conn, do_rebind, NULL); #elif LDAP_SET_REBIND_PROC_ARGS == 2 |