Howard convinced me that this version is slightly better.

[openldap] / libraries / libldap / bind.c

diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index 336c229f0f612ab6cbb8d790fd7715d38b387e61..b9579f2b4a9c7b6530c0cbb9e74e9e9ea7d21dd7 100644 (file)
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -9,10 +10,32 @@
  *  bind.c
  */
 
+/*
+ *     BindRequest ::= SEQUENCE {
+ *             version         INTEGER,
+ *             name            DistinguishedName,       -- who
+ *             authentication  CHOICE {
+ *                     simple          [0] OCTET STRING -- passwd
+#ifdef HAVE_KERBEROS
+ *                     krbv42ldap      [1] OCTET STRING
+ *                     krbv42dsa       [2] OCTET STRING
+#endif
+ *                     sasl            [3] SaslCredentials     -- LDAPv3
+ *             }
+ *     }
+ *
+ *     BindResponse ::= SEQUENCE {
+ *             COMPONENTS OF LDAPResult,
+ *             serverSaslCreds         OCTET STRING OPTIONAL -- LDAPv3
+ *     }
+ *
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -37,22 +60,6 @@
 int
 ldap_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd, int authmethod )
 {
-       /*
-        * The bind request looks like this:
-        *      BindRequest ::= SEQUENCE {
-        *              version         INTEGER,
-        *              name            DistinguishedName,       -- who
-        *              authentication  CHOICE {
-        *                      simple          [0] OCTET STRING -- passwd
-#ifdef HAVE_KERBEROS
-        *                      krbv42ldap      [1] OCTET STRING
-        *                      krbv42dsa       [2] OCTET STRING
-#endif
-        *              }
-        *      }
-        * all wrapped up in an LDAPMessage sequence.
-        */
-
        Debug( LDAP_DEBUG_TRACE, "ldap_bind\n", 0, 0, 0 );
 
        switch ( authmethod ) {
@@ -67,6 +74,10 @@ ldap_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd, int authmetho
                return( ldap_kerberos_bind2( ld, dn ) );
 #endif
 
+       case LDAP_AUTH_SASL:
+               /* user must use ldap_sasl_bind */
+               /* FALL-THRU */
+
        default:
                ld->ld_errno = LDAP_AUTH_UNKNOWN;
                return( -1 );
@@ -111,6 +122,10 @@ ldap_bind_s(
                return( ldap_kerberos_bind2_s( ld, dn ) );
 #endif
 
+       case LDAP_AUTH_SASL:
+               /* user must use ldap_sasl_bind */
+               /* FALL-THRU */
+
        default:
                return( ld->ld_errno = LDAP_AUTH_UNKNOWN );
        }
@@ -121,5 +136,8 @@ void
 ldap_set_rebind_proc( LDAP *ld, int (*rebindproc)( LDAP *ld, char **dnp,
        char **passwdp, int *authmethodp, int freeit ))
 {
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
        ld->ld_rebindproc = rebindproc;
 }