Diff for /servers/slapd/root_dse.c between versions 1.31 and 1.36

version 1.31, 2000/05/15 19:22:57 version 1.36, 2000/05/30 19:34:56
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.29 2000/05/15 14:33:07 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.35 2000/05/22 01:46:58 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 17 Line 17
   
 #include "slap.h"  #include "slap.h"
   
 void  int
 root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )  root_dse_info( Entry **entry, const char **text )
 {  {
         char buf[BUFSIZ];          char buf[BUFSIZ];
         Entry           *e;          Entry           *e;
Line 33  root_dse_info( Connection *conn, Operati Line 33  root_dse_info( Connection *conn, Operati
         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  #else
         char *ad_objectClass = "objectClass";          char *ad_objectClass = "objectClass";
Line 44  root_dse_info( Connection *conn, Operati Line 41  root_dse_info( Connection *conn, Operati
         char *ad_supportedExtension = "supportedExtension";          char *ad_supportedExtension = "supportedExtension";
         char *ad_supportedLDAPVersion = "supportedLDAPVersion";          char *ad_supportedLDAPVersion = "supportedLDAPVersion";
         char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";          char *ad_supportedSASLMechanisms = "supportedSASLMechanisms";
 #ifdef SLAPD_ACI_ENABLED  
         char *ad_supportedACIMechanisms = "supportedACIMechanisms";  
 #endif  
         char *ad_ref = "ref";          char *ad_ref = "ref";
 #endif  #endif
   
Line 65  root_dse_info( Connection *conn, Operati Line 59  root_dse_info( Connection *conn, Operati
         val.bv_len = sizeof("top")-1;          val.bv_len = sizeof("top")-1;
         attr_merge( e, ad_objectClass, vals );          attr_merge( e, ad_objectClass, vals );
   
         val.bv_val = "LDAProotDSE";          val.bv_val = "OpenLDAProotDSE";
         val.bv_len = sizeof("LDAProotDSE")-1;          val.bv_len = sizeof("OpenLDAProotDSE")-1;
         attr_merge( e, ad_objectClass, vals );          attr_merge( e, ad_objectClass, vals );
   
         for ( i = 0; i < nbackends; i++ ) {          for ( i = 0; i < nbackends; i++ ) {
Line 109  root_dse_info( Connection *conn, Operati Line 103  root_dse_info( Connection *conn, Operati
                 }                  }
         }          }
   
 #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 );
         }          }
   
         send_search_entry( &backends[0], conn, op,          *entry = e;
                 e, attrs, attrsonly, NULL );          return LDAP_SUCCESS;
   
         send_search_result( conn, op, LDAP_SUCCESS,  
                 NULL, NULL, NULL, NULL, 1 );  
   
         entry_free( e );  
 }  }
   

Removed from v.1.31  
changed lines
  Added in v.1.36


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