Move experimental Back-BDB2 to Attic

[openldap] / servers / slapd / monitor.c

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 935ae28feeb683089363ed97ff53122d6e4943fc..dbe8dda1ffa523f8043cb068694a5b89c6899fa3 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -27,12 +27,10 @@
 
 #if defined( SLAPD_MONITOR_DN )
 
-void
+int
 monitor_info(
-       Connection *conn,
-       Operation *op,
-       char ** attrs,
-       int attrsonly )
+       Entry **entry,
+       const char **text )
 {
        Entry           *e;
        char            buf[BUFSIZ];
@@ -58,6 +56,18 @@ monitor_info(
        (void) dn_normalize( e->e_ndn );
        e->e_private = NULL;
 
+       val.bv_val = "top";
+       val.bv_len = sizeof("top")-1;
+       attr_merge( e, "objectClass", vals );
+
+       val.bv_val = "LDAPsubentry";
+       val.bv_len = sizeof("LDAPsubentry")-1;
+       attr_merge( e, "objectClass", vals );
+
+       val.bv_val = "extensibleObject";
+       val.bv_len = sizeof("extensibleObject")-1;
+       attr_merge( e, "objectClass", vals );
+
        {
                char *rdn = ch_strdup( SLAPD_MONITOR_DN );
                val.bv_val = strchr( rdn, '=' );
@@ -136,9 +146,9 @@ monitor_info(
                    c->c_ops != NULL ? "x" : "",
                    c->c_pending_ops != NULL ? "p" : "",
                        connection_state2str( c->c_conn_state ),
-                       c->c_bind_in_progress ? "S" : "",
+                       c->c_sasl_bind_in_progress ? "S" : "",
 
-                   c->c_cdn ? c->c_cdn : "<anonymous>",
+                   c->c_cdn ? c->c_cdn : SLAPD_ANONYMOUS,
 
                        c->c_listener_url,
                    c->c_peer_domain,
@@ -251,24 +261,8 @@ monitor_info(
        attr_merge( e, "concurrency", vals );
 #endif
 
-       val.bv_val = "top";
-       val.bv_len = sizeof("top")-1;
-       attr_merge( e, "objectClass", vals );
-
-       val.bv_val = "LDAPsubentry";
-       val.bv_len = sizeof("LDAPsubentry")-1;
-       attr_merge( e, "objectClass", vals );
-
-       val.bv_val = "extensibleObject";
-       val.bv_len = sizeof("extensibleObject")-1;
-       attr_merge( e, "objectClass", vals );
-
-       send_search_entry( &backends[0], conn, op, e,
-               attrs, attrsonly, NULL );
-       send_search_result( conn, op, LDAP_SUCCESS,
-               NULL, NULL, NULL, NULL, 1 );
-
-       entry_free( e );
+       *entry = e;
+       return LDAP_SUCCESS;
 }
 
 #endif /* slapd_monitor_dn */