ITS#2919 move OpenLDAPtime to OpenLDAPperson

[openldap] / servers / slapd / bind.c

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index f06652000d868260c87f720719983f587cacc7eb..c39caea9f64e37be8a26d0ead16d2685e5fa49bd 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -183,7 +183,7 @@ do_bind(
                        "requested protocol version not supported" );
                goto cleanup;
 
-       } else if (!( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_V2 ) &&
+       } else if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
                version < LDAP_VERSION3 )
        {
                send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
@@ -231,7 +231,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
        struct berval   mech = op->orb_tmp_mech;
 
        /* check for inappropriate controls */
-       if( get_manageDSAit( op ) == SLAP_CRITICAL_CONTROL ) {
+       if( get_manageDSAit( op ) == SLAP_CONTROL_CRITICAL ) {
                send_ldap_error( op, rs,
                        LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
                        "manageDSAit control inappropriate" );
@@ -298,7 +298,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
                        }
 
                        if( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
-                               ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming_auth);
+                               ber_len_t max = sockbuf_max_incoming_auth;
                                ber_sockbuf_ctrl( op->o_conn->c_sb,
                                        LBER_SB_OPT_SET_MAX_INCOMING, &max );
                        }
@@ -373,20 +373,20 @@ fe_op_bind( Operation *op, SlapReply *rs )
                        rs->sr_err = LDAP_SUCCESS;
 
                        if( !BER_BVISEMPTY( &op->orb_cred ) &&
-                               !( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_ANON_CRED ))
+                               !( global_allows & SLAP_ALLOW_BIND_ANON_CRED ))
                        {
                                /* cred is not empty, disallow */
                                rs->sr_err = LDAP_INVALID_CREDENTIALS;
 
                        } else if ( !BER_BVISEMPTY( &op->o_req_ndn ) &&
-                               !( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_ANON_DN ))
+                               !( global_allows & SLAP_ALLOW_BIND_ANON_DN ))
                        {
                                /* DN is not empty, disallow */
                                rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
                                rs->sr_text =
                                        "unauthenticated bind (DN with no password) disallowed";
 
-                       } else if ( SLAPD_GLOBAL(disallows) & SLAP_DISALLOW_BIND_ANON ) {
+                       } else if ( global_disallows & SLAP_DISALLOW_BIND_ANON ) {
                                /* disallow */
                                rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
                                rs->sr_text = "anonymous bind disallowed";
@@ -404,7 +404,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
                                op->o_protocol, 0, 0 );
                        goto cleanup;
 
-               } else if ( SLAPD_GLOBAL(disallows) & SLAP_DISALLOW_BIND_SIMPLE ) {
+               } else if ( global_disallows & SLAP_DISALLOW_BIND_SIMPLE ) {
                        /* disallow simple authentication */
                        rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
                        rs->sr_text = "unwilling to perform simple authentication";
@@ -418,7 +418,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        } else if ( op->orb_method == LDAP_AUTH_KRBV41 ) {
-               if ( SLAPD_GLOBAL(disallows) & SLAP_DISALLOW_BIND_KRBV4 ) {
+               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";
@@ -464,7 +464,9 @@ fe_op_bind( Operation *op, SlapReply *rs )
                /* don't return referral for bind requests */
                /* noSuchObject is not allowed to be returned by bind */
                rs->sr_err = LDAP_INVALID_CREDENTIALS;
+               op->o_bd = frontendDB;
                send_ldap_result( op, rs );
+               op->o_bd = NULL;
                goto cleanup;
        }
 
@@ -533,7 +535,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
                                op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
                                BER_BVZERO( &op->o_req_ndn );
                                if ( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
-                                       ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming_auth);
+                                       ber_len_t max = sockbuf_max_incoming_auth;
                                        ber_sockbuf_ctrl( op->o_conn->c_sb,
                                                LBER_SB_OPT_SET_MAX_INCOMING, &max );
                                }
@@ -572,7 +574,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
                        ber_dupbv( &op->o_conn->c_ndn, &op->o_req_ndn );
 
                        if( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
-                               ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming_auth);
+                               ber_len_t max = sockbuf_max_incoming_auth;
                                ber_sockbuf_ctrl( op->o_conn->c_sb,
                                        LBER_SB_OPT_SET_MAX_INCOMING, &max );
                        }
@@ -594,6 +596,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
 
                } else if ( !BER_BVISNULL( &op->orb_edn ) ) {
                        free( op->orb_edn.bv_val );
+                       BER_BVZERO( &op->orb_edn );
                }
 
        } else {