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

version 1.81.2.13, 2005/08/12 19:29:51 version 1.94, 2004/10/01 05:33:17
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.81.2.12 2005/01/20 17:01:09 kurt Exp $ */  /* $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/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1999-2005 The OpenLDAP Foundation.   * Copyright 1999-2004 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 29 Line 29
 #endif  #endif
   
 static struct berval supportedFeatures[] = {  static struct berval supportedFeatures[] = {
         BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */  
         BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),                     /* All Op Attrs (+) */          BER_BVC(LDAP_FEATURE_ALL_OP_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 (@class) */
         BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */          BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
Line 38  static struct berval supportedFeatures[] Line 37  static struct berval supportedFeatures[]
   
 #ifdef LDAP_DEVEL  #ifdef LDAP_DEVEL
         BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */          BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
           BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
 #endif  #endif
         {0,NULL}          {0,NULL}
 };  };
Line 81  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 174  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 202  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 245  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.13  
changed lines
  Added in v.1.94


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