X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fbind.c;h=037d2455dcbf5d69b1c37931e49b32b4b96bc14b;hb=d9edc7d5afd2860fac2fa0121044db28d94c9f7f;hp=99b5d475892d3e6d50c001021bd796a1e9017f4c;hpb=b72a61a7b7fdaa0f9a5f7f933538d89d2dfbaccf;p=openldap
diff --git a/servers/slapd/back-monitor/bind.c b/servers/slapd/back-monitor/bind.c
index 99b5d47589..037d2455dc 100644
--- a/servers/slapd/back-monitor/bind.c
+++ b/servers/slapd/back-monitor/bind.c
@@ -1,34 +1,22 @@
/* bind.c - monitor backend bind routine */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2001-2011 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * 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.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved.
- *
- * This work has beed deveolped for the OpenLDAP Foundation
- * in the hope that it may be useful to the Open Source community,
- * but WITHOUT ANY WARRANTY.
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- * of use of this software, no matter how awful, even if they arise from
- * flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users
- * ever read sources, credits should appear in the documentation.
- * SysNet s.n.c. cannot be responsible for the consequences of the
- * alterations.
- *
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software.
*/
#include "portable.h"
@@ -45,28 +33,16 @@
int
monitor_back_bind( Operation *op, SlapReply *rs )
{
-#if 0 /* not used yet */
- struct monitorinfo *mi
- = (struct monitorinfo *) op->o_bd->be_private;
-#endif
-
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_MON, ENTRY, "monitor_back_bind: dn: %s.\n",
- op->o_req_dn.bv_val, 0, 0 );
-#else
Debug(LDAP_DEBUG_ARGS, "==> monitor_back_bind: dn: %s\n",
op->o_req_dn.bv_val, 0, 0 );
-#endif
-
- 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;
}