X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fbind.c;h=2ef983f64928b4889ff19b45078a6a31cc2805bf;hb=dc07e765f263ef459dcd2afd1ece01cfc85a0edd;hp=be796f192013fefcbabef5115aa3132dd4446cef;hpb=30eb9ed76f5b1cdc834ff531f449e1d9ee3badf3;p=openldap

diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index be796f1920..2ef983f649 100644
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1990 Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -7,10 +11,6 @@
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -18,8 +18,7 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
+#include "ldap-int.h"
 
 
 /*
@@ -36,7 +35,7 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
  */
 
 int
-ldap_bind( LDAP *ld, char *dn, char *passwd, int authmethod )
+ldap_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd, int authmethod )
 {
 	/*
 	 * The bind request looks like this:
@@ -45,7 +44,7 @@ ldap_bind( LDAP *ld, char *dn, char *passwd, int authmethod )
 	 *		name		DistinguishedName,	 -- who
 	 *		authentication	CHOICE {
 	 *			simple		[0] OCTET STRING -- passwd
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 	 *			krbv42ldap	[1] OCTET STRING
 	 *			krbv42dsa	[2] OCTET STRING
 #endif
@@ -60,7 +59,7 @@ ldap_bind( LDAP *ld, char *dn, char *passwd, int authmethod )
 	case LDAP_AUTH_SIMPLE:
 		return( ldap_simple_bind( ld, dn, passwd ) );
 
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 	case LDAP_AUTH_KRBV41:
 		return( ldap_kerberos_bind1( ld, dn ) );
 
@@ -89,7 +88,11 @@ ldap_bind( LDAP *ld, char *dn, char *passwd, int authmethod )
  *	    NULL, LDAP_AUTH_KRBV4 )
  */
 int
-ldap_bind_s( LDAP *ld, char *dn, char *passwd, int authmethod )
+ldap_bind_s(
+	LDAP *ld,
+	LDAP_CONST char *dn,
+	LDAP_CONST char *passwd,
+	int authmethod )
 {
 	Debug( LDAP_DEBUG_TRACE, "ldap_bind_s\n", 0, 0, 0 );
 
@@ -97,7 +100,7 @@ ldap_bind_s( LDAP *ld, char *dn, char *passwd, int authmethod )
 	case LDAP_AUTH_SIMPLE:
 		return( ldap_simple_bind_s( ld, dn, passwd ) );
 
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 	case LDAP_AUTH_KRBV4:
 		return( ldap_kerberos_bind_s( ld, dn ) );
 
@@ -114,11 +117,11 @@ ldap_bind_s( LDAP *ld, char *dn, char *passwd, int authmethod )
 }
 
 
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 void
 ldap_set_rebind_proc( LDAP *ld, int (*rebindproc)( LDAP *ld, char **dnp,
 	char **passwdp, int *authmethodp, int freeit ))
 {
 	ld->ld_rebindproc = rebindproc;
 }
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */