Diff for /servers/slapd/root_dse.c between versions 1.81.2.12 and 1.83

version 1.81.2.12, 2005/01/20 17:01:09 version 1.83, 2003/08/07 14:42:40
Line 1 Line 1
 /* root_dse.c - Provides the Root DSA-Specific Entry */  /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.82 2003/05/31 18:19:02 kurt Exp $ */
 /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.81.2.11 2004/04/06 18:16:01 kurt Exp $ */  /* root_dse.c - Provides the Root DSA-Specific Entry
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  
  *   *
  * Copyright 1999-2005 The OpenLDAP Foundation.   * Copyright 1999-2003 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 are permitted only
  * modification, are permitted only as authorized by the OpenLDAP   * as authorized by the OpenLDAP Public License.  A copy of this
  * Public License.   * license is available at http://www.OpenLDAP.org/license.html or
  *   * 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 25 Line 21
 #include "lber_pvt.h"  #include "lber_pvt.h"
   
 #ifdef LDAP_SLAPI  #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"  #include "slapi.h"
 #endif  #endif
   
 static struct berval supportedFeatures[] = {  static struct berval supportedFeatures[] = {
         BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),                     /* All Op Attrs (+) */          BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* All Op Attrs (+) */
         BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS),        /* OCs in Attrs List (@class) */          BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (+person) */
         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 */
           BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
 #ifdef LDAP_DEVEL  
         BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */  
         BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */  
 #endif  
         {0,NULL}          {0,NULL}
 };  };
   
Line 119  root_dse_info( Line 111  root_dse_info(
         }          }
   
         for ( i = 0; i < nbackends; i++ ) {          for ( i = 0; i < nbackends; i++ ) {
                 if ( backends[i].be_suffix == NULL                  if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
                                 || 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 158  root_dse_info( Line 145  root_dse_info(
   
 #ifdef LDAP_SLAPI  #ifdef LDAP_SLAPI
         /* netscape supportedExtension */          /* netscape supportedExtension */
         for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {          for ( i = 0; (bv = ns_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;

Removed from v.1.81.2.12  
changed lines
  Added in v.1.83


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