#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;
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 );
}
}
}
/* 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++ ) {