Remove LDAP_PORT dependencies so that ldap.conf defaults take over.

[openldap] / libraries / libldap / kbind.c

diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index e900cc881f9b899e1cb2d6ecef70825ff65559c0..316b9080207958927ec0ee8c24b2b362d2bf4023 100644 (file)
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -11,7 +11,7 @@
 static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
 #endif
 
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -19,13 +19,11 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
 #include <ac/krb.h>
 #include <ac/socket.h>
 #include <ac/string.h>
+#include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
 #include "ldap-int.h"
 
 
-
 /*
  * ldap_kerberos_bind1 - initiate a bind to the ldap server using
  * kerberos authentication.  The dn is supplied.  It is assumed the user
@@ -42,7 +40,6 @@ ldap_kerberos_bind1( LDAP *ld, char *dn )
        BerElement      *ber;
        char            *cred;
        int             rc, credlen;
-       char            *ldap_get_kerberosv4_credentials();
 #ifdef STR_TRANSLATION
        int             str_translation_on;
 #endif /* STR_TRANSLATION */
@@ -102,11 +99,11 @@ ldap_kerberos_bind1( LDAP *ld, char *dn )
 
        free( cred );
 
-#ifndef NO_CACHE
+#ifndef LDAP_NOCACHE
        if ( ld->ld_cache != NULL ) {
                ldap_flush_cache( ld );
        }
-#endif /* !NO_CACHE */
+#endif /* !LDAP_NOCACHE */
 
        /* send the message */
        return ( ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber ));
@@ -149,7 +146,6 @@ ldap_kerberos_bind2( LDAP *ld, char *dn )
        BerElement      *ber;
        char            *cred;
        int             rc, credlen;
-       char            *ldap_get_kerberosv4_credentials();
 #ifdef STR_TRANSLATION
        int             str_translation_on;
 #endif /* STR_TRANSLATION */
@@ -254,25 +250,25 @@ ldap_get_kerberosv4_credentials( LDAP *ld, char *who, char *service, int *len )
        Debug( LDAP_DEBUG_TRACE, "ldap_get_kerberosv4_credentials\n", 0, 0, 0 );
 
        if ( (err = krb_get_tf_realm( tkt_string(), realm )) != KSUCCESS ) {
-#ifndef NO_USERINTERFACE
+#ifdef LDAP_LIBUI
                fprintf( stderr, "krb_get_tf_realm failed (%s)\n",
                    krb_err_txt[err] );
-#endif /* NO_USERINTERFACE */
+#endif /* LDAP_LIBUI */
                ld->ld_errno = LDAP_INVALID_CREDENTIALS;
                return( NULL );
        }
 
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        krbinstance = ld->ld_defconn->lconn_krbinstance;
-#else /* LDAP_REFERRALS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
        krbinstance = ld->ld_host;
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
        if ( (err = krb_mk_req( &ktxt, service, krbinstance, realm, 0 ))
            != KSUCCESS ) {
-#ifndef NO_USERINTERFACE
+#ifdef LDAP_LIBUI
                fprintf( stderr, "krb_mk_req failed (%s)\n", krb_err_txt[err] );
-#endif /* NO_USERINTERFACE */
+#endif /* LDAP_LIBUI */
                ld->ld_errno = LDAP_INVALID_CREDENTIALS;
                return( NULL );
        }
@@ -289,4 +285,4 @@ ldap_get_kerberosv4_credentials( LDAP *ld, char *who, char *service, int *len )
 }
 
 #endif /* !AUTHMAN */
-#endif /* KERBEROS */
+#endif /* HAVE_KERBEROS */