tolerate that config_get_vals() returns success with no values (ITS#4341)

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

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index fff9e892c98e9542943678535e23b8c96ad94762..102d5c0d55c52d46620376785c38e0e242143f17 100644 (file)
--- a/servers/slapd/back-monitor/listener.c
+++ b/servers/slapd/back-monitor/listener.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -22,21 +22,22 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/string.h>
 
 #include "slap.h"
 #include "back-monitor.h"
 
 int
 monitor_subsys_listener_init(
-       BackendDB       *be,
-       monitorsubsys   *ms
+       BackendDB               *be,
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
-       Entry                   *e_listener, **ep;
-       int                     i;
-       struct monitorentrypriv *mp;
-       Listener                **l;
+       monitor_info_t  *mi;
+       Entry           *e_listener, **ep;
+       int             i;
+       monitor_entry_t *mp;
+       Listener        **l;
 
        assert( be != NULL );
 
@@ -51,12 +52,9 @@ monitor_subsys_listener_init(
                return( -1 );
        }
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
-       if ( monitor_cache_get( mi, 
-                               &ms->mss_ndn, 
-                               &e_listener ) )
-       {
+       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_listener ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_listener_init: "
                        "unable to get entry \"%s\"\n",
@@ -64,39 +62,21 @@ monitor_subsys_listener_init(
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_listener->e_private;
+       mp = ( monitor_entry_t * )e_listener->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
-       for ( i = 0; l[i]; i++ ) {
+       for ( i = 0; l[ i ]; i++ ) {
                char            buf[ BACKMONITOR_BUFSIZE ];
                Entry           *e;
+               struct berval bv;
+
+               bv.bv_len = snprintf( buf, sizeof( buf ),
+                               "cn=Listener %d", i );
+               bv.bv_val = buf;
+               e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+                       mi->mi_oc_monitoredObject, mi, NULL, NULL );
 
-               snprintf( buf, sizeof( buf ),
-                               "dn: cn=Listener %d,%s\n"
-                               "objectClass: %s\n"
-                               "structuralObjectClass: %s\n"
-                               "cn: Listener %d\n"
-                               "%s: %s\n"
-                               "labeledURI: %s\n"
-                               "creatorsName: %s\n"
-                               "modifiersName: %s\n"
-                               "createTimestamp: %s\n"
-                               "modifyTimestamp: %s\n",
-                               i,
-                               ms->mss_dn.bv_val,
-                               mi->mi_oc_monitoredObject->soc_cname.bv_val,
-                               mi->mi_oc_monitoredObject->soc_cname.bv_val,
-                               i,
-                               mi->mi_ad_monitorConnectionLocalAddress->ad_cname.bv_val,
-                               l[i]->sl_name.bv_val,
-                               l[i]->sl_url.bv_val,
-                               mi->mi_creatorsName.bv_val,
-                               mi->mi_creatorsName.bv_val,
-                               mi->mi_startTime.bv_val,
-                               mi->mi_startTime.bv_val );
-               
-               e = str2entry( buf );
                if ( e == NULL ) {
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_listener_init: "
@@ -105,19 +85,23 @@ monitor_subsys_listener_init(
                        return( -1 );
                }
 
+               attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionLocalAddress,
+                               &l[ i ]->sl_name, NULL );
+
+               attr_merge_normalize_one( e, slap_schema.si_ad_labeledURI,
+                               &l[ i ]->sl_url, NULL );
+
 #ifdef HAVE_TLS
-               if ( l[i]->sl_is_tls ) {
+               if ( l[ i ]->sl_is_tls ) {
                        struct berval bv;
 
-                       bv.bv_val = "TLS";
-                       bv.bv_len = sizeof("TLS")-1;
-
+                       BER_BVSTR( &bv, "TLS" );
                        attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
                                        &bv, NULL );
                }
 #endif /* HAVE_TLS */
 #ifdef LDAP_CONNECTIONLESS
-               if ( l[i]->sl_is_udp ) {
+               if ( l[ i ]->sl_is_udp ) {
                        struct berval bv;
 
                        BER_BVSTR( &bv, "UDP" );
@@ -126,10 +110,11 @@ monitor_subsys_listener_init(
                }
 #endif /* HAVE_TLS */
 
-               mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+               mp = monitor_entrypriv_create();
+               if ( mp == NULL ) {
+                       return -1;
+               }
                e->e_private = ( void * )mp;
-               mp->mp_next = NULL;
-               mp->mp_children = NULL;
                mp->mp_info = ms;
                mp->mp_flags = ms->mss_flags
                        | MONITOR_F_SUB;