HEADS-UP: complete reworking of back-monitor

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

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 2224ec1de75d7d2baa7189d6b84d5a03a3c5882d..37fc482c3eaa927e7ceed10601baa8741e29696b 100644 (file)
--- a/servers/slapd/back-monitor/listener.c
+++ b/servers/slapd/back-monitor/listener.c
@@ -50,7 +50,6 @@ monitor_subsys_listener_init(
        Listener                **l;
 
        assert( be != NULL );
-       assert( monitor_ad_desc != NULL );
 
        mi = ( struct monitorinfo * )be->be_private;
 
@@ -92,13 +91,17 @@ monitor_subsys_listener_init(
 
                snprintf( buf, sizeof( buf ),
                                "dn: cn=Listener %d,%s\n"
-                               SLAPD_MONITOR_OBJECTCLASSES
+                               "objectClass: %s\n"
+                               "structuralObjectClass: %s\n"
                                "cn: Listener %d\n"
-                               "description: %s\n"
+                               "%s: %s\n"
                                "labeledURI: %s",
                                i,
                                monitor_subsys[SLAPD_MONITOR_LISTENER].mss_dn.bv_val,
+                               mi->oc_monitoredObject->soc_cname.bv_val,
+                               mi->oc_monitoredObject->soc_cname.bv_val,
                                i,
+                               mi->ad_monitorConnectionLocalAddress->ad_cname.bv_val,
                                l[i]->sl_name.bv_val,
                                l[i]->sl_url.bv_val );
                
@@ -127,7 +130,8 @@ monitor_subsys_listener_init(
                        bv.bv_val = "TLS";
                        bv.bv_len = sizeof("TLS")-1;
 
-                       attr_merge_normalize_one( e, monitor_ad_desc, &bv );
+                       attr_merge_normalize_one( e, mi->ad_monitoredInfo,
+                                       &bv, NULL );
                }
 #endif /* HAVE_TLS */
 #ifdef LDAP_CONNECTIONLESS
@@ -137,7 +141,8 @@ monitor_subsys_listener_init(
                        bv.bv_val = "UDP";
                        bv.bv_len = sizeof("UDP")-1;
 
-                       attr_merge_normalize_one( e, monitor_ad_desc, &bv );
+                       attr_merge_normalize_one( e, mi->ad_monitoredInfo,
+                                       &bv, NULL );
                }
 #endif /* HAVE_TLS */