Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / back-monitor / bind.c

diff --git a/servers/slapd/back-monitor/bind.c b/servers/slapd/back-monitor/bind.c
index ddb73decd905b8c4e19b843db5f8f70d4467215d..536bffcf2291bbf5ede87d5cfe775f5bea616fdd 100644 (file)
--- a/servers/slapd/back-monitor/bind.c
+++ b/servers/slapd/back-monitor/bind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2012 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -33,23 +33,16 @@
 int
 monitor_back_bind( Operation *op, SlapReply *rs )
 {
-#if 0  /* not used yet */
-       monitor_info_t  *mi
-               = (monitor_info_t *) op->o_bd->be_private;
-#endif
-
        Debug(LDAP_DEBUG_ARGS, "==> monitor_back_bind: dn: %s\n", 
                        op->o_req_dn.bv_val, 0, 0 );
-       
-       if ( op->oq_bind.rb_method == LDAP_AUTH_SIMPLE 
-                       && be_isroot_pw( op ) ) {
-               ber_dupbv( &op->oq_bind.rb_edn, be_root_dn( op->o_bd ) );
-               return( 0 );
+
+       if ( be_isroot_pw( op ) ) {
+               return LDAP_SUCCESS;
        }
 
        rs->sr_err = LDAP_INVALID_CREDENTIALS;
        send_ldap_result( op, rs );
 
-       return( 1 );
+       return rs->sr_err;
 }