publish updateref...

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

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 0462626320e11e23f068dcf2bff6f9327917cd30..ae0453b62bb16cf562746196001a8bc0ffbac8ce 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-2005 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,7 +62,7 @@ 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;
 
@@ -109,9 +107,7 @@ monitor_subsys_listener_init(
                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 );
                }