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

version 1.94, 2004/10/01 05:33:17 version 1.95.2.2, 2005/02/02 17:32:44
Line 1 Line 1
 /* 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 $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.95.2.1 2005/01/20 18:03:56 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1999-2004 The OpenLDAP Foundation.   * Copyright 1999-2005 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 34  static struct berval supportedFeatures[] Line 34  static struct berval supportedFeatures[]
         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_FEATURE_SUBORDINATE_SCOPE
 #ifdef LDAP_DEVEL  
         BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */          BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
   #endif
   #ifdef LDAP_FEATURE_MODIFY_INCREMENT
         BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */          BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
 #endif  #endif
         {0,NULL}          {0,NULL}
Line 127  root_dse_info( Line 128  root_dse_info(
                         }                          }
                         continue;                          continue;
                 }                  }
                 if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {                  if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) && !SLAP_GLUE_ADVERTISE( &backends[i] ) ) {
                         continue;                          continue;
                 }                  }
                 for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {                  for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
Line 169  root_dse_info( Line 170  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 (!( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_V2 ) &&                  if (!( 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 197  root_dse_info( Line 198  root_dse_info(
                 ldap_charray_free( supportedSASLMechanisms );                  ldap_charray_free( supportedSASLMechanisms );
         }          }
   
         if ( SLAPD_GLOBAL(default_referral) != NULL ) {          if ( default_referral != NULL ) {
                 if( attr_merge( e, ad_ref, SLAPD_GLOBAL(default_referral), NULL /* FIXME */ ) ) {                  if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
                         return LDAP_OTHER;                          return LDAP_OTHER;
                 }                  }
         }          }

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


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