Diff for /servers/slapd/root_dse.c between versions 1.33 and 1.37

version 1.33, 2000/05/16 16:13:08 version 1.37, 2000/06/06 17:43:20
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.32 2000/05/16 14:22:52 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.36 2000/05/30 19:34:56 kurt Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry  /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *   *
  * Copyright 1999-2000 The OpenLDAP Foundation.   * Copyright 1999-2000 The OpenLDAP Foundation.
Line 18 Line 18
 #include "slap.h"  #include "slap.h"
   
 int  int
 root_dse_info( Entry **entry, char **text )  root_dse_info( Entry **entry, const char **text )
 {  {
         char buf[BUFSIZ];          char buf[BUFSIZ];
         Entry           *e;          Entry           *e;
Line 26  root_dse_info( Entry **entry, char **tex Line 26  root_dse_info( Entry **entry, char **tex
         struct berval   *vals[2];          struct berval   *vals[2];
         int             i, j;          int             i, j;
   
 #ifdef SLAPD_SCHEMA_NOT_COMPAT  
         AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;          AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
         AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;          AttributeDescription *ad_namingContexts = slap_schema.si_ad_namingContexts;
         AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;          AttributeDescription *ad_supportedControl = slap_schema.si_ad_supportedControl;
         AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;          AttributeDescription *ad_supportedExtension = slap_schema.si_ad_supportedExtension;
         AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;          AttributeDescription *ad_supportedLDAPVersion = slap_schema.si_ad_supportedLDAPVersion;
         AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;          AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
 #ifdef SLAPD_ACI_ENABLED  
         AttributeDescription *ad_supportedACIMechanisms = slap_schema.si_ad_supportedACIMechanisms;  
 #endif  
         AttributeDescription *ad_ref = slap_schema.si_ad_ref;          AttributeDescription *ad_ref = slap_schema.si_ad_ref;
 #else  
         char *ad_objectClass = "objectClass";  
         char *ad_namingContexts = "namingContexts";  
         char *ad_supportedControl = "supportedControl";  
         char *ad_supportedExtension = "supportedExtension";  
         char *ad_supportedLDAPVersion = "supportedLDAPVersion";  
         char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";  
 #ifdef SLAPD_ACI_ENABLED  
         char *ad_supportedACIMechanisms = "supportedACIMechanisms";  
 #endif  
         char *ad_ref = "ref";  
 #endif  
   
         vals[0] = &val;          vals[0] = &val;
         vals[1] = NULL;          vals[1] = NULL;
Line 109  root_dse_info( Entry **entry, char **tex Line 93  root_dse_info( Entry **entry, char **tex
                 }                  }
         }          }
   
 #ifdef SLAPD_ACI_ENABLED  
         /* supportedACIMechanisms */  
         for ( i=0; (val.bv_val = get_supported_acimech(i)) != NULL; i++ ) {  
                 val.bv_len = strlen( val.bv_val );  
                 attr_merge( e, ad_supportedACIMechanisms, vals );  
         }  
 #endif  
   
         if ( default_referral != NULL ) {          if ( default_referral != NULL ) {
                 attr_merge( e, ad_ref, default_referral );                  attr_merge( e, ad_ref, default_referral );
         }          }

Removed from v.1.33  
changed lines
  Added in v.1.37


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