Diff for /servers/slapd/root_dse.c between versions 1.81.2.3 and 1.94

version 1.81.2.3, 2003/09/19 16:49:36 version 1.94, 2004/10/01 05:33:17
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.81.2.2 2003/09/18 15:43:35 kurt Exp $ */  /* root_dse.c - Provides the Root DSA-Specific Entry */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry  /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.93 2004/09/04 02:54:30 kurt Exp $ */
   /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1999-2003 The OpenLDAP Foundation.   * Copyright 1999-2004 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms are permitted only   * Redistribution and use in source and binary forms, with or without
  * as authorized by the OpenLDAP Public License.  A copy of this   * modification, are permitted only as authorized by the OpenLDAP
  * license is available at http://www.OpenLDAP.org/license.html or   * Public License.
  * in file LICENSE in the top-level directory of the distribution.   *
    * A copy of this license is available in the file LICENSE in the
    * top-level directory of the distribution or, alternatively, at
    * <http://www.OpenLDAP.org/license.html>.
  */   */
   
 #include "portable.h"  #include "portable.h"
Line 21 Line 25
 #include "lber_pvt.h"  #include "lber_pvt.h"
   
 #ifdef LDAP_SLAPI  #ifdef LDAP_SLAPI
 #include "slapi.h"  #include "slapi/slapi.h"
 #endif  #endif
   
 static struct berval supportedFeatures[] = {  static struct berval supportedFeatures[] = {
         BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* All Op Attrs (+) */          BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),                     /* All Op Attrs (+) */
         BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (+person) */          BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS),        /* OCs in Attrs List (@class) */
         BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */          BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
         BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */          BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
         BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */          BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),/* Language Range Options */
   
 #ifdef LDAP_DEVEL  #ifdef LDAP_DEVEL
         BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */          BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
           BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
 #endif  #endif
         {0,NULL}          {0,NULL}
 };  };
Line 75  root_dse_info( Line 81  root_dse_info(
         e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );          e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
   
         if( e == NULL ) {          if( e == NULL ) {
 #ifdef NEW_LOGGING  
                 LDAP_LOG( OPERATION, ERR,  
                         "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );  
 #else  
                 Debug( LDAP_DEBUG_ANY,                  Debug( LDAP_DEBUG_ANY,
                         "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );                          "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
 #endif  
                 return LDAP_OTHER;                  return LDAP_OTHER;
         }          }
   
Line 113  root_dse_info( Line 114  root_dse_info(
         }          }
   
         for ( i = 0; i < nbackends; i++ ) {          for ( i = 0; i < nbackends; i++ ) {
                 if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {                  if ( backends[i].be_suffix == NULL
                                   || backends[i].be_nsuffix == NULL ) {
                           /* no suffix! */
                           continue;
                   }
                   if ( SLAP_MONITOR( &backends[i] )) {
                         vals[0] = backends[i].be_suffix[0];                          vals[0] = backends[i].be_suffix[0];
                         nvals[0] = backends[i].be_nsuffix[0];                          nvals[0] = backends[i].be_nsuffix[0];
                         if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {                          if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {
Line 147  root_dse_info( Line 153  root_dse_info(
   
 #ifdef LDAP_SLAPI  #ifdef LDAP_SLAPI
         /* netscape supportedExtension */          /* netscape supportedExtension */
         for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {          for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
                 vals[0] = *bv;                  vals[0] = *bv;
                 if( attr_merge( e, ad_supportedExtension, vals, NULL )) {                  if( attr_merge( e, ad_supportedExtension, vals, NULL )) {
                         return LDAP_OTHER;                          return LDAP_OTHER;
Line 163  root_dse_info( Line 169  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++ ) {
                 char buf[BUFSIZ];                  char buf[BUFSIZ];
                 if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&                  if (!( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_V2 ) &&
                         ( i < LDAP_VERSION3 ) )                          ( i < LDAP_VERSION3 ) )
                 {                  {
                         /* version 2 and lower are disallowed */                          /* version 2 and lower are disallowed */
Line 191  root_dse_info( Line 197  root_dse_info(
                 ldap_charray_free( supportedSASLMechanisms );                  ldap_charray_free( supportedSASLMechanisms );
         }          }
   
         if ( default_referral != NULL ) {          if ( SLAPD_GLOBAL(default_referral) != NULL ) {
                 if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {                  if( attr_merge( e, ad_ref, SLAPD_GLOBAL(default_referral), NULL /* FIXME */ ) ) {
                         return LDAP_OTHER;                          return LDAP_OTHER;
                 }                  }
         }          }
Line 234  int read_root_dse_file( const char *fnam Line 240  int read_root_dse_file( const char *fnam
   
         usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );          usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
         if( usr_attr == NULL ) {          if( usr_attr == NULL ) {
 #ifdef NEW_LOGGING  
                 LDAP_LOG( OPERATION, ERR,  
                         "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );  
 #else  
                 Debug( LDAP_DEBUG_ANY,                  Debug( LDAP_DEBUG_ANY,
                         "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );                          "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
 #endif  
                 fclose( fp );                  fclose( fp );
                 return LDAP_OTHER;                  return LDAP_OTHER;
         }          }

Removed from v.1.81.2.3  
changed lines
  Added in v.1.94


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