DirectoryString syntaxes must have one or more octets to be valid.

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 8264c52cd650bce21dc2009a59f37a86ed357865..f987948c1e5506a9b94c84dd43ec00ba9f7bd461 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -1,6 +1,7 @@
+/* $OpenLDAP$ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
- * Copyright 1999 The OpenLDAP Foundation.
+ * Copyright 1999-2000 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -12,19 +13,27 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/string.h>
 
-#include "ldapconfig.h"
 #include "slap.h"
 
-void
-root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
+int
+root_dse_info( Entry **entry, const char **text )
 {
+       char buf[BUFSIZ];
        Entry           *e;
-       char            buf[BUFSIZ];
        struct berval   val;
        struct berval   *vals[2];
        int             i, j;
 
+       AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
+       AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;
+       AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;
+       AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;
+       AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;
+       AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
+       AttributeDescription *ad_ref = slap_schema.si_ad_ref;
+
        vals[0] = &val;
        vals[1] = NULL;
 
@@ -32,55 +41,63 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 
        e->e_attrs = NULL;
        e->e_dn = ch_strdup( LDAP_ROOT_DSE );
-       e->e_ndn = dn_normalize_case( ch_strdup( LDAP_ROOT_DSE ));
+       e->e_ndn = ch_strdup( LDAP_ROOT_DSE );
+       (void) dn_normalize( e->e_ndn );
        e->e_private = NULL;
 
+       val.bv_val = "top";
+       val.bv_len = sizeof("top")-1;
+       attr_merge( e, ad_objectClass, vals );
+
+       val.bv_val = "OpenLDAProotDSE";
+       val.bv_len = sizeof("OpenLDAProotDSE")-1;
+       attr_merge( e, ad_objectClass, vals );
+
        for ( i = 0; i < nbackends; i++ ) {
                for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
-                       strcpy( buf, backends[i].be_suffix[j] );
-                       val.bv_val = buf;
-                       val.bv_len = strlen( buf );
-                       attr_merge( e, "namingContexts", vals );
+                       val.bv_val = backends[i].be_suffix[j];
+                       val.bv_len = strlen( val.bv_val );
+                       attr_merge( e, ad_namingContexts, vals );
                }
        }
 
-#if defined( SLAPD_MONITOR_DN )
-       strcpy( buf, SLAPD_MONITOR_DN );
-       val.bv_val = buf;
-       val.bv_len = strlen( buf );
-       attr_merge( e, "namingContexts", vals );
-#endif
-
-#if defined( SLAPD_CONFIG_DN )
-       strcpy( buf, SLAPD_CONFIG_DN );
-       val.bv_val = buf;
-       val.bv_len = strlen( buf );
-       attr_merge( e, "namingContexts", vals );
-#endif
-
-#if defined( SLAPD_SCHEMA_DN )
-       val.bv_val = ch_strdup( SLAPD_SCHEMA_DN );
-       val.bv_len = strlen( val.bv_val );
-       attr_merge( e, "namingContexts", vals );
-       attr_merge( e, "subschemaSubentry", vals );
-       ldap_memfree( val.bv_val );
-#endif
-
        /* altServer unsupported */
-       /* supportedExtension: no extensions supported */
-       /* supportedControl: no controls supported */
-       /* supportedSASLMechanism: not yet */
 
+       /* supportedControl */
+       for ( i=0; supportedControls[i] != NULL; i++ ) {
+               val.bv_val = supportedControls[i];
+               val.bv_len = strlen( val.bv_val );
+               attr_merge( e, ad_supportedControl, vals );
+       }
+
+       /* supportedExtension */
+       for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) {
+               val.bv_len = strlen( val.bv_val );
+               attr_merge( e, ad_supportedExtension, vals );
+       }
+
+       /* supportedLDAPVersion */
        for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
                sprintf(buf,"%d",i);
                val.bv_val = buf;
-               val.bv_len = strlen( buf );
-               attr_merge( e, "supportedLDAPVersion", vals );
+               val.bv_len = strlen( val.bv_val );
+               attr_merge( e, ad_supportedLDAPVersion, vals );
+       }
+
+       /* supportedSASLMechanism */
+       if( supportedSASLMechanisms != NULL ) {
+               for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
+                       val.bv_val = supportedSASLMechanisms[i];
+                       val.bv_len = strlen( val.bv_val );
+                       attr_merge( e, ad_supportedSASLMechanisms, vals );
+               }
+       }
+
+       if ( default_referral != NULL ) {
+               attr_merge( e, ad_ref, default_referral );
        }
-       
-       send_search_entry( &backends[0], conn, op, e, attrs, attrsonly );
-       send_ldap_search_result( conn, op, LDAP_SUCCESS, NULL, NULL, 1 );
 
-       entry_free( e );
+       *entry = e;
+       return LDAP_SUCCESS;
 }