Diff for /servers/slapd/root_dse.c between versions 1.61.2.9 and 1.69

version 1.61.2.9, 2003/03/05 23:48:33 version 1.69, 2002/11/08 16:13:20
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61.2.8 2003/02/10 19:22:47 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.68 2002/11/01 17:59:53 julius Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry  /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *   *
  * Copyright 1999-2003 The OpenLDAP Foundation.   * Copyright 1999-2002 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 are permitted only
Line 13 Line 13
 #include "portable.h"  #include "portable.h"
   
 #include <stdio.h>  #include <stdio.h>
   
 #include <ac/string.h>  #include <ac/string.h>
   
 #include "slap.h"  #include "slap.h"
 #include <ldif.h>  #include <ldif.h>
 #include "lber_pvt.h"  #include "lber_pvt.h"
   
 #ifdef LDAP_SLAPI  
 #include "slapi.h"  
 #endif  
   
 static struct berval supportedFeatures[] = {  static struct berval supportedFeatures[] = {
         BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */          BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */
         BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */          BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */
Line 113  root_dse_info( Line 108  root_dse_info(
                                 return LDAP_OTHER;                                  return LDAP_OTHER;
                         continue;                          continue;
                 }                  }
                 if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {                  if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
                         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 139  root_dse_info( Line 134  root_dse_info(
                         return LDAP_OTHER;                          return LDAP_OTHER;
         }          }
   
 #ifdef LDAP_SLAPI  
         /* netscape supportedExtension */  
         for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {  
                 vals[0] = *bv;  
                 attr_merge( e, ad_supportedExtension, vals );  
         }  
 #endif /* LDAP_SLAPI */  
   
         /* supportedFeatures */          /* supportedFeatures */
         if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )          if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
                 return LDAP_OTHER;                  return LDAP_OTHER;
Line 237  int read_root_dse_file( const char *fnam Line 224  int read_root_dse_file( const char *fnam
                 if( e == NULL ) {                  if( e == NULL ) {
                         fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",                          fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",
                                 lineno );                                  lineno );
                           entry_free( e );
                         entry_free( usr_attr );                          entry_free( usr_attr );
                         usr_attr = NULL;                          usr_attr = NULL;
                         return EXIT_FAILURE;                          return EXIT_FAILURE;

Removed from v.1.61.2.9  
changed lines
  Added in v.1.69


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