Vienna Bulk Commit

[openldap] / libraries / libldap / bind.c

diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index 1668a3e73a24895509f6e4ffad8e33e7330acf59..2ef983f64928b4889ff19b45078a6a31cc2805bf 100644 (file)
--- 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>
 
@@ -35,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:
@@ -88,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 );
 
@@ -113,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 */