Diff for /servers/slapd/root_dse.c between versions 1.12.2.5 and 1.31

version 1.12.2.5, 2000/08/31 16:55:28 version 1.31, 2000/05/15 19:22:57
Line 1 Line 1
 /* $OpenLDAP$ */  /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.29 2000/05/15 14:33:07 kurt Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry  /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *   *
  * Copyright 1999-2000 The OpenLDAP Foundation.   * Copyright 1999-2000 The OpenLDAP Foundation.
Line 17 Line 17
   
 #include "slap.h"  #include "slap.h"
   
 int  void
 root_dse_info(  root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
         Connection *conn,  
         Entry **entry,  
         const char **text )  
 {  {
         char buf[BUFSIZ];          char buf[BUFSIZ];
         Entry           *e;          Entry           *e;
         struct berval   val;          struct berval   val;
         struct berval   *vals[2];          struct berval   *vals[2];
         int             i, j;          int             i, j;
         char ** supportedSASLMechanisms;  
   
   #ifdef SLAPD_SCHEMA_NOT_COMPAT
         AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;          AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
         AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;          AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;
         AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;          AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;
         AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;          AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;
         AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;          AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;
         AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;          AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
   #ifdef SLAPD_ACI_ENABLED
           AttributeDescription *ad_supportedACIMechanisms = slap_schema.si_ad_supportedACIMechanisms;
   #endif
         AttributeDescription *ad_ref = slap_schema.si_ad_ref;          AttributeDescription *ad_ref = slap_schema.si_ad_ref;
   #else
           char *ad_objectClass = "objectClass";
           char *ad_namingContexts = "namingContexts";
           char *ad_supportedControl = "supportedControl";
           char *ad_supportedExtension = "supportedExtension";
           char *ad_supportedLDAPVersion = "supportedLDAPVersion";
           char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";
   #ifdef SLAPD_ACI_ENABLED
           char *ad_supportedACIMechanisms = "supportedACIMechanisms";
   #endif
           char *ad_ref = "ref";
   #endif
   
         vals[0] = &val;          vals[0] = &val;
         vals[1] = NULL;          vals[1] = NULL;
Line 53  root_dse_info( Line 65  root_dse_info(
         val.bv_len = sizeof("top")-1;          val.bv_len = sizeof("top")-1;
         attr_merge( e, ad_objectClass, vals );          attr_merge( e, ad_objectClass, vals );
   
         val.bv_val = "OpenLDAProotDSE";          val.bv_val = "LDAProotDSE";
         val.bv_len = sizeof("OpenLDAProotDSE")-1;          val.bv_len = sizeof("LDAProotDSE")-1;
         attr_merge( e, ad_objectClass, vals );          attr_merge( e, ad_objectClass, vals );
   
         for ( i = 0; i < nbackends; i++ ) {          for ( i = 0; i < nbackends; i++ ) {
Line 82  root_dse_info( Line 94  root_dse_info(
   
         /* supportedLDAPVersion */          /* supportedLDAPVersion */
         for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {          for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
                 if (( global_disallows & SLAP_DISALLOW_BIND_V2 ) &&  
                         ( i < LDAP_VERSION3 ) )  
                 {  
                         /* version 2 and lower are disallowed */  
                         continue;  
                 }  
                 sprintf(buf,"%d",i);                  sprintf(buf,"%d",i);
                 val.bv_val = buf;                  val.bv_val = buf;
                 val.bv_len = strlen( val.bv_val );                  val.bv_len = strlen( val.bv_val );
Line 95  root_dse_info( Line 101  root_dse_info(
         }          }
   
         /* supportedSASLMechanism */          /* supportedSASLMechanism */
         supportedSASLMechanisms = slap_sasl_mechs( conn );  
   
         if( supportedSASLMechanisms != NULL ) {          if( supportedSASLMechanisms != NULL ) {
                 for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {                  for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
                         val.bv_val = supportedSASLMechanisms[i];                          val.bv_val = supportedSASLMechanisms[i];
Line 105  root_dse_info( Line 109  root_dse_info(
                 }                  }
         }          }
   
   #ifdef SLAPD_ACI_ENABLED
           /* supportedACIMechanisms */
           for ( i=0; (val.bv_val = get_supported_acimech(i)) != NULL; i++ ) {
                   val.bv_len = strlen( val.bv_val );
                   attr_merge( e, ad_supportedACIMechanisms, vals );
           }
   #endif
   
         if ( default_referral != NULL ) {          if ( default_referral != NULL ) {
                 attr_merge( e, ad_ref, default_referral );                  attr_merge( e, ad_ref, default_referral );
         }          }
   
         *entry = e;          send_search_entry( &backends[0], conn, op,
         return LDAP_SUCCESS;                  e, attrs, attrsonly, NULL );
   
           send_search_result( conn, op, LDAP_SUCCESS,
                   NULL, NULL, NULL, NULL, 1 );
   
           entry_free( e );
 }  }
   

Removed from v.1.12.2.5  
changed lines
  Added in v.1.31


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org