Happy new year

[openldap] / libraries / libldap / sbind.c

diff --git a/libraries/libldap/sbind.c b/libraries/libldap/sbind.c
index 656c722f155fcbc3e9b119da616154c6c19bea0b..8a5e26ba4426eacf53c12e38d76884c2a8e4ba46 100644 (file)
--- a/libraries/libldap/sbind.c
+++ b/libraries/libldap/sbind.c
@@ -1,31 +1,55 @@
-/*
- *  Copyright (c) 1993 Regents of the University of Michigan.
- *  All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- *  sbind.c
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1993 Regents of the University of Michigan.
+ * All rights reserved.
+ */
+/* Portions Copyright (C) The Internet Society (1997)
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
  */
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
+/*
+ *     BindRequest ::= SEQUENCE {
+ *             version         INTEGER,
+ *             name            DistinguishedName,       -- who
+ *             authentication  CHOICE {
+ *                     simple          [0] OCTET STRING -- passwd
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+ *                     krbv42ldap      [1] OCTET STRING
+ *                     krbv42dsa       [2] OCTET STRING
 #endif
+ *                     sasl            [3] SaslCredentials     -- LDAPv3
+ *             }
+ *     }
+ *
+ *     BindResponse ::= SEQUENCE {
+ *             COMPONENTS OF LDAPResult,
+ *             serverSaslCreds         OCTET STRING OPTIONAL -- LDAPv3
+ *     }
+ *
+ */
 
-#include <stdio.h>
-#include <string.h>
+#include "portable.h"
 
-#ifdef MACOS
-#include "macos.h"
-#endif /* MACOS */
+#include <stdio.h>
 
-#if !defined( MACOS ) && !defined( DOS )
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
 #include "ldap-int.h"
 
-
 /*
  * ldap_simple_bind - bind to the ldap server (and X.500).  The dn and
  * password of the entry to which to bind are supplied.  The message id
@@ -37,50 +61,36 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
  */
 
 int
-ldap_simple_bind( LDAP *ld, char *dn, char *passwd )
+ldap_simple_bind(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *passwd )
 {
-       BerElement      *ber;
-
-       /*
-        * The bind request looks like this:
-        *      BindRequest ::= SEQUENCE {
-        *              version         INTEGER,
-        *              name            DistinguishedName,       -- who
-        *              authentication  CHOICE {
-        *                      simple          [0] OCTET STRING -- passwd
-        *              }
-        *      }
-        * all wrapped up in an LDAPMessage sequence.
-        */
+       int rc;
+       int msgid;
+       struct berval cred;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_simple_bind\n", 0, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind\n", 0, 0, 0 );
+#endif
 
-       if ( dn == NULL )
-               dn = "";
-       if ( passwd == NULL )
-               passwd = "";
-
-       /* create a message to send */
-       if ( (ber = alloc_ber_with_options( ld )) == NULLBER ) {
-               return( -1 );
-       }
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
 
-       /* fill it in */
-       if ( ber_printf( ber, "{it{ists}}", ++ld->ld_msgid, LDAP_REQ_BIND,
-           ld->ld_version, dn, LDAP_AUTH_SIMPLE, passwd ) == -1 ) {
-               ld->ld_errno = LDAP_ENCODING_ERROR;
-               ber_free( ber, 1 );
-               return( -1 );
+       if ( passwd != NULL ) {
+               cred.bv_val = (char *) passwd;
+               cred.bv_len = strlen( passwd );
+       } else {
+               cred.bv_val = "";
+               cred.bv_len = 0;
        }
 
-#ifndef NO_CACHE
-       if ( ld->ld_cache != NULL ) {
-               ldap_flush_cache( ld );
-       }
-#endif /* !NO_CACHE */
+       rc = ldap_sasl_bind( ld, dn, LDAP_SASL_SIMPLE, &cred,
+               NULL, NULL, &msgid );
 
-       /* send the message */
-       return( send_initial_request( ld, LDAP_REQ_BIND, dn, ber ));
+       return rc == LDAP_SUCCESS ? msgid : -1;
 }
 
 /*
@@ -95,18 +105,24 @@ ldap_simple_bind( LDAP *ld, char *dn, char *passwd )
  */
 
 int
-ldap_simple_bind_s( LDAP *ld, char *dn, char *passwd )
+ldap_simple_bind_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd )
 {
-       int             msgid;
-       LDAPMessage     *result;
+       struct berval cred;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_simple_bind_s\n", 0, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind_s\n", 0, 0, 0 );
+#endif
 
-       if ( (msgid = ldap_simple_bind( ld, dn, passwd )) == -1 )
-               return( ld->ld_errno );
-
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) 0, &result ) == -1 )
-               return( ld->ld_errno ); /* ldap_result sets ld_errno */
+       if ( passwd != NULL ) {
+               cred.bv_val = (char *) passwd;
+               cred.bv_len = strlen( passwd );
+       } else {
+               cred.bv_val = "";
+               cred.bv_len = 0;
+       }
 
-       return( ldap_result2error( ld, result, 1 ) );
+       return ldap_sasl_bind_s( ld, dn, LDAP_SASL_SIMPLE, &cred,
+               NULL, NULL, NULL );
 }