streamline group attr specification/diagnostics

[openldap] / servers / slapd / bind.c

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 24074d36a9e0b03e8d65f2c52d568d441ebeb4ee..706cc43559b06ff9718c91c1080ff75e0a8642dd 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -86,8 +86,8 @@ do_bind(
         *              name            DistinguishedName,       -- dn
         *              authentication  CHOICE {
         *                      simple          [0] OCTET STRING -- passwd
-        *                      krbv42ldap      [1] OCTET STRING
-        *                      krbv42dsa       [2] OCTET STRING
+        *                      krbv42ldap      [1] OCTET STRING -- OBSOLETE
+        *                      krbv42dsa       [2] OCTET STRING -- OBSOLETE
         *                      SASL            [3] SaslCredentials
         *              }
         *      }
@@ -340,33 +340,6 @@ fe_op_bind( Operation *op, SlapReply *rs )
                        goto cleanup;
                }
 
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-       } else if ( op->orb_method == LDAP_AUTH_KRBV41 ) {
-               if ( global_disallows & SLAP_DISALLOW_BIND_KRBV4 ) {
-                       /* disallow krbv4 authentication */
-                       rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
-                       rs->sr_text = "unwilling to perform Kerberos V4 bind";
-
-                       send_ldap_result( op, rs );
-
-                       Debug( LDAP_DEBUG_TRACE,
-                               "do_bind: v%d Kerberos V4 (step 1) bind refused\n",
-                               op->o_protocol, 0, 0 );
-                       goto cleanup;
-               }
-               BER_BVSTR( &op->orb_tmp_mech, "KRBV4" );
-
-       } else if ( op->orb_method == LDAP_AUTH_KRBV42 ) {
-               rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
-               rs->sr_text = "Kerberos V4 (step 2) bind not supported";
-               send_ldap_result( op, rs );
-
-               Debug( LDAP_DEBUG_TRACE,
-                       "do_bind: v%d Kerberos V4 (step 2) bind refused\n",
-                       op->o_protocol, 0, 0 );
-               goto cleanup;
-#endif
-
        } else {
                rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
                rs->sr_text = "unknown authentication method";