From ed68c977d924b9f16cd08e7c5e6e26540ab57848 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 14 Sep 2000 07:22:01 +0000 Subject: [PATCH] Zap LDAP_LIBUI --- configure | 8 +------- configure.in | 4 ---- include/portable.h.in | 3 --- libraries/libldap/getfilter.c | 7 +++---- libraries/libldap/kbind.c | 14 ++++++-------- 5 files changed, 10 insertions(+), 26 deletions(-) diff --git a/configure b/configure index df54551360..0f5257b26a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # $OpenLDAP$ -# from OpenLDAP: pkg/ldap/configure.in,v 1.325 2000/09/12 19:19:16 kurt Exp +# from OpenLDAP: pkg/ldap/configure.in,v 1.326 2000/09/12 23:40:17 kurt Exp # Copyright 1998-2000 The OpenLDAP Foundation. All Rights Reserved. # @@ -15827,12 +15827,6 @@ if test "$ol_enable_syslog" = yes ; then #define LDAP_SYSLOG 1 EOF -fi -if test "$ol_enable_libui" = yes ; then - cat >> confdefs.h <<\EOF -#define LDAP_LIBUI 1 -EOF - fi if test "$ol_enable_cache" = no ; then cat >> confdefs.h <<\EOF diff --git a/configure.in b/configure.in index e21088b423..f78443aecb 100644 --- a/configure.in +++ b/configure.in @@ -2156,10 +2156,6 @@ if test "$ol_enable_syslog" = yes ; then AC_DEFINE(LDAP_SYSLOG,1, [define this to add syslog code]) fi -if test "$ol_enable_libui" = yes ; then - AC_DEFINE(LDAP_LIBUI,1, - [define this for LDAP User Interface support]) -fi if test "$ol_enable_cache" = no ; then AC_DEFINE(LDAP_NOCACHE,1, [define this to remove -lldap cache support]) diff --git a/include/portable.h.in b/include/portable.h.in index 2f653160a5..85a78557fc 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -837,9 +837,6 @@ /* define this to add syslog code */ #undef LDAP_SYSLOG -/* define this for LDAP User Interface support */ -#undef LDAP_LIBUI - /* define this to remove -lldap cache support */ #undef LDAP_NOCACHE diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c index 9939ae88ac..e6570187cc 100644 --- a/libraries/libldap/getfilter.c +++ b/libraries/libldap/getfilter.c @@ -122,14 +122,13 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen ) nextflp->lfl_tag = LDAP_STRDUP( tag ); nextflp->lfl_pattern = tok[ 0 ]; if ( (rc = regcomp( &re, nextflp->lfl_pattern, 0 )) != 0 ) { -#ifdef LDAP_LIBUI char error[512]; regerror(rc, &re, error, sizeof(error)); ldap_getfilter_free( lfdp ); - fprintf( stderr, "bad regular expression %s, %s\n", - nextflp->lfl_pattern, error ); + Debug( LDAP_DEBUG_ANY, "ldap_init_get_filter_buf: " + "bad regular expression %s, %s\n", + nextflp->lfl_pattern, error, 0 ); errno = EINVAL; -#endif /* LDAP_LIBUI */ LDAP_VFREE( tok ); return( NULL ); } diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c index 240c3f7b24..1da20d716f 100644 --- a/libraries/libldap/kbind.c +++ b/libraries/libldap/kbind.c @@ -243,10 +243,8 @@ ldap_get_kerberosv4_credentials( Debug( LDAP_DEBUG_TRACE, "ldap_get_kerberosv4_credentials\n", 0, 0, 0 ); if ( (err = krb_get_tf_realm( tkt_string(), realm )) != KSUCCESS ) { -#ifdef LDAP_LIBUI - fprintf( stderr, "krb_get_tf_realm failed (%s)\n", - krb_err_txt[err] ); -#endif /* LDAP_LIBUI */ + Debug( LDAP_DEBUG_ANY, "ldap_get_kerberosv4_credentials: " + "krb_get_tf_realm failed: %s\n", krb_err_txt[err], 0, 0 ); ld->ld_errno = LDAP_AUTH_UNKNOWN; return( NULL ); } @@ -261,10 +259,10 @@ ldap_get_kerberosv4_credentials( krbinstance = ld->ld_defconn->lconn_krbinstance; if ( (err = krb_mk_req( &ktxt, service, krbinstance, realm, 0 )) - != KSUCCESS ) { -#ifdef LDAP_LIBUI - fprintf( stderr, "krb_mk_req failed (%s)\n", krb_err_txt[err] ); -#endif /* LDAP_LIBUI */ + != KSUCCESS ) + { + Debug( LDAP_DEBUG_ANY, "ldap_get_kerberosv4_credentials: " + "krb_mk_req failed (%s)\n", krb_err_txt[err], 0, 0 ); ld->ld_errno = LDAP_AUTH_UNKNOWN; return( NULL ); } -- 2.39.5