Set peeraddr also for IPv6, fixes ITS#1918

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

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index 17e1b41657359a0a5458033382a0b146aca95c09..bd65f90639b2b2df3f995200e1137b6583fe763c 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -51,7 +51,6 @@ monitor_subsys_backend_init(
        Entry                   *e, *e_backend, *e_tmp;
        int                     i;
        struct monitorentrypriv *mp;
-       struct berval           bv[2];
 
        mi = ( struct monitorinfo * )be->be_private;
 
@@ -73,11 +72,11 @@ monitor_subsys_backend_init(
                return( -1 );
        }
 
-       bv[1].bv_val = NULL;
        e_tmp = NULL;
        for ( i = nBackendInfo; i--; ) {
-               char buf[1024];
-               BackendInfo *bi;
+               char            buf[1024];
+               BackendInfo     *bi;
+               struct berval   bv[ 2 ];
 
                bi = &backendInfo[i];
 
@@ -100,7 +99,7 @@ monitor_subsys_backend_init(
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
-                               "unable to create entry 'Backend cn=%d,%s'\n%s",
+                               "unable to create entry 'cn=Backend %d,%s'\n%s",
                                i, 
                                monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
                                "" );
@@ -110,6 +109,7 @@ monitor_subsys_backend_init(
                
                bv[0].bv_val = bi->bi_type;
                bv[0].bv_len = strlen( bv[0].bv_val );
+               bv[1].bv_val = NULL;
 
                attr_merge( e, monitor_ad_desc, bv );
                attr_merge( e_backend, monitor_ad_desc, bv );