upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-08 08:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Zap LDAP_LIBUI

Browse source
This commit is contained in:
Kurt Zeilenga 2000-09-14 07:22:01 +00:00
parent f2b1d423c1
commit ed68c977d9
5 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure vendored
View file

@ -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

4
configure.in
View file

@ -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])

3
include/portable.h.in
View file

@ -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

7
libraries/libldap/getfilter.c
View file

@ -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 );
}

14
libraries/libldap/kbind.c
View file

@ -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 );
}