/* $OpenLDAP$ */
/* root_dse.c - Provides the ROOT DSA-Specific Entry
*
- * Copyright 1999-2000 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted only
#include "slap.h"
#include <ldif.h>
-
-static char *supportedFeatures[] = {
- "1.3.6.1.4.1.4203.1.5.1", /* all Operational Attributes ("+") */
- "1.3.6.1.4.1.4203.1.5.2", /* OCs in Attributes List */
- "1.3.6.1.4.1.4203.1.5.3", /* (&) and (|) search filters */
- NULL
+#include "lber_pvt.h"
+
+static struct berval supportedFeatures[] = {
+ BER_BVC("1.3.6.1.4.1.4203.1.5.1"), /* all Operational Attributes ("+") */
+ BER_BVC("1.3.6.1.4.1.4203.1.5.2"), /* OCs in Attributes List */
+ BER_BVC("1.3.6.1.4.1.4203.1.5.3"), /* (&) and (|) search filters */
+ BER_BVC("1.3.6.1.4.1.4203.1.5.4"), /* Language Tag Options */
+ BER_BVC("1.3.6.1.4.1.4203.1.5.5"), /* Language Range Options */
+ {0,NULL}
};
static Entry *usr_attr = NULL;
{
char buf[BUFSIZ];
Entry *e;
- struct berval vals[2];
+ struct berval vals[2], *bv;
int i, j;
char ** supportedSASLMechanisms;
AttributeDescription *ad_ref
= slap_schema.si_ad_ref;
- Attribute *a;
-
vals[1].bv_val = NULL;
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
attr_merge( e, ad_objectClass, vals );
for ( i = 0; i < nbackends; i++ ) {
- if ( backends[i].be_glueflags & SLAP_GLUE_SUBORDINATE )
+ if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
continue;
- for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
- vals[0] = *backends[i].be_suffix[j];
+ }
+ for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
+ vals[0] = backends[i].be_suffix[j];
attr_merge( e, ad_namingContexts, vals );
}
}
/* altServer unsupported */
/* supportedControl */
- for ( i=0; supportedControls[i] != NULL; i++ ) {
- vals[0].bv_val = supportedControls[i];
+ for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {
vals[0].bv_len = strlen( vals[0].bv_val );
attr_merge( e, ad_supportedControl, vals );
}
/* supportedExtension */
- for ( i=0; (vals[0].bv_val = get_supported_extop(i)) != NULL; i++ ) {
- vals[0].bv_len = strlen( vals[0].bv_val );
+ for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
+ vals[0] = *bv;
attr_merge( e, ad_supportedExtension, vals );
}
/* supportedFeatures */
- for ( i=0; supportedFeatures[i] != NULL; i++ ) {
- vals[0].bv_val = supportedFeatures[i];
- vals[0].bv_len = strlen( vals[0].bv_val );
- attr_merge( e, ad_supportedFeatures, vals );
- }
+ attr_merge( e, ad_supportedFeatures, supportedFeatures );
/* supportedLDAPVersion */
for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
}
if( usr_attr != NULL) {
- for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) {
+ Attribute *a;
+ for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
attr_merge( e, a->a_desc, a->a_vals );
}
}
int rc = 0, lineno = 0, lmax = 0;
char *buf = NULL;
- Attribute *a;
-
if ( (fp = fopen( fname, "r" )) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"could not open rootdse attr file \"%s\" - absolute path?\n",
while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
Entry *e = str2entry( buf );
+ Attribute *a;
if( e == NULL ) {
fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",