Add search no-op support.

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

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index d30a2f716c1350c9d34918d17546ec9217ffdf0f..7dbb0a51ad10f3c24be2debf3e98a86de53ead6e 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -1,12 +1,9 @@
 /* operation.c - deal with operation subsystem */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
- * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- * 
  * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
  * 
  * This work has beed deveolped for the OpenLDAP Foundation 
@@ -58,17 +55,17 @@ monitor_subsys_ops_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi,
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn, &e_op ) ) {
+                       &monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn, &e_op ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
@@ -81,15 +78,9 @@ monitor_subsys_ops_init(
         */
        snprintf( buf, sizeof( buf ),
                        "dn: cn=Initiated,%s\n"
-                       "objectClass: top\n"
-                       "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
-                       "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
-                       "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
+                       SLAPD_MONITOR_OBJECTCLASSES
                        "cn: Initiated\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -97,12 +88,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Initiated,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Initiated,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -126,12 +117,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Initiated,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Initiated,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -144,15 +135,9 @@ monitor_subsys_ops_init(
         */
        snprintf( buf, sizeof( buf ),
                        "dn: cn=Completed,%s\n"
-                       "objectClass: top\n"
-                       "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
-                       "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
-                       "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
+                       SLAPD_MONITOR_OBJECTCLASSES
                        "cn: Completed\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -160,12 +145,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Completed,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Completed,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -188,12 +173,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Completed,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Completed,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );