Vienna Bulk Commit

[openldap] / libraries / libldap / bind.c

diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index 0a0487349eac0d66780f8a90517aca6e1e685b85..2ef983f64928b4889ff19b45078a6a31cc2805bf 100644 (file)
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.c
@@ -1,34 +1,24 @@
 /*
+ * 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.
  *
  *  bind.c
  */
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
+#include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#ifdef MACOS
 #include <stdlib.h>
-#include "macos.h"
-#else /* MACOS */
-#ifdef DOS
-#include "msdos.h"
-#ifdef NCSA
-#include "externs.h"
-#endif /* NCSA */
-#else /* DOS */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#endif /* DOS */
-#endif /* MACOS */
-
-#include "lber.h"
-#include "ldap.h"
+
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#include "ldap-int.h"
 
 
 /*
@@ -45,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:
@@ -54,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
@@ -69,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 ) );
 
@@ -98,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 );
 
@@ -106,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 ) );
 
@@ -123,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 */