Cast char* argument to hh_to_c() to Byte*

[openldap] / libraries / libldap / kbind.c

diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index 90367171a9a74c70cc0b6d9518b18f906b9904a2..9a0f4a1e008cd0b27c28871eeae65d496ae98223 100644 (file)
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1993 Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -7,10 +11,6 @@
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #ifdef HAVE_KERBEROS
 
 #include <stdio.h>
@@ -40,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 */
@@ -147,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 */
@@ -260,11 +258,11 @@ ldap_get_kerberosv4_credentials( LDAP *ld, char *who, char *service, int *len )
                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 ) {