Changed ldap_pvt_tls_get_my_dn and ldap_pvt_tls_get_peer_dn to store result

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

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 71049a9305c8aba1d4081d62fbf5a2bdb78dd571..13ce9d58389c114d99b0e67bd0a23d19d063670d 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -1,12 +1,9 @@
 /* database.c - deals with database 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 
@@ -51,7 +48,8 @@ monitor_subsys_database_init(
        int                     i;
        struct monitorentrypriv *mp;
        AttributeDescription    *ad_nc = slap_schema.si_ad_namingContexts;
-       struct berval           bv[2];
+       AttributeDescription    *ad_seeAlso = NULL;
+       const char              *text = NULL;
 
        assert( be != NULL );
        assert( monitor_ad_desc != NULL );
@@ -59,23 +57,27 @@ monitor_subsys_database_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, 
+                               &monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, 
                                &e_database ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_database_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_database_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
        }
 
+       if ( slap_str2ad( "seeAlso", &ad_seeAlso, &text ) != LDAP_SUCCESS ) {
+               return( -1 );
+       }
+
        e_tmp = NULL;
        for ( i = nBackendDB; i--; ) {
                char buf[1024];
@@ -84,50 +86,66 @@ monitor_subsys_database_init(
                be = &backendDB[i];
 
                snprintf( buf, sizeof( buf ),
-                               "dn: cn=%d,%s\n"
-                               "objectClass: top\n"
-                               "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
-                               "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
-                               "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
-                               "cn: %d\n",
+                               "dn: cn=Database %d,%s\n"
+                               SLAPD_MONITOR_OBJECTCLASSES
+                               "cn: Database %d\n"
+                               "description: %s",
+                               i,
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val,
                                i,
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn->bv_val,
-                               i );
+                               be->bd_info->bi_type );
                
                e = str2entry( buf );
                if ( e == NULL ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                                "monitor_subsys_database_init: "
-                               "unable to create entry 'cn=%d,%s'\n",
+                               "unable to create entry 'cn=Database %d,%s'\n",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val ));
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_database_init: "
-                               "unable to create entry 'cn=%d,%s'\n%s",
+                               "unable to create entry 'cn=Database %d,%s'\n%s",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val,
                                "" );
 #endif
                        return( -1 );
                }
                
-               bv[1].bv_val = NULL;
-               bv[0].bv_val = be->bd_info->bi_type;
-               bv[0].bv_len = strlen( bv[0].bv_val );
-               attr_merge( e, monitor_ad_desc, bv );
-               
                for ( j = 0; be->be_suffix[j]; j++ ) {
-                       bv[0] = *be->be_suffix[j];
+                       struct berval           bv[ 2 ];
+
+                       bv[ 0 ] = *be->be_suffix[ j ];
+                       bv[ 1 ].bv_val = NULL;
 
                        attr_merge( e, ad_nc, bv );
                        attr_merge( e_database, ad_nc, bv );
                }
-                               
+
+               for ( j = nBackendInfo; j--; ) {
+                       if ( &backendInfo[ j ] == be->bd_info ) {
+                               struct berval           bv[ 2 ];
+
+                               /* we check the pointer; the test on the
+                                * string should be more reliable */
+                               assert( strcasecmp( backendInfo[ j ].bi_type,
+                                       be->bd_info->bi_type ) == 0 );
+
+                               snprintf( buf, sizeof( buf ), 
+                                       "cn=Backend %d,%s", 
+                                       j, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val );
+                               bv[ 0 ].bv_val = buf;
+                               bv[ 0 ].bv_len = strlen( buf );
+                               bv[ 1 ].bv_val = NULL;
+                               attr_merge( e, ad_seeAlso, bv );
+                               break;
+                       }
+               }
+               /* we must find it! */
+               assert( j >= 0 );
+
                mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
                e->e_private = ( void * )mp;
                mp->mp_next = e_tmp;
@@ -140,15 +158,15 @@ monitor_subsys_database_init(
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                                "monitor_subsys_database_init: "
-                               "unable to add entry 'cn=%d,%s'\n",
+                               "unable to add entry 'cn=Database %d,%s'\n",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val ));
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_database_init: "
-                               "unable to add entry 'cn=%d,%s'\n",
+                               "unable to add entry 'cn=Database %d,%s'\n",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val,
                                0 );
 #endif
                        return( -1 );