const char **text )
{
Entry *e;
- struct berval val, *bv;
- struct berval nval;
+ struct berval val;
+#ifdef LDAP_SLAPI
+ struct berval *bv;
+#endif
int i, j;
char ** supportedSASLMechanisms;
BackendDB *be;
= slap_schema.si_ad_objectClass;
AttributeDescription *ad_namingContexts
= slap_schema.si_ad_namingContexts;
+#ifdef LDAP_SLAPI
AttributeDescription *ad_supportedExtension
= slap_schema.si_ad_supportedExtension;
+#endif
AttributeDescription *ad_supportedLDAPVersion
= slap_schema.si_ad_supportedLDAPVersion;
AttributeDescription *ad_supportedSASLMechanisms
}
/* supportedLDAPVersion */
- for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
+ /* don't publish version 2 as we don't really support it
+ * (even when configured to accept version 2 Bind requests)
+ * and the value would never be used by true LDAPv2 (or LDAPv3)
+ * clients.
+ */
+ for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) {
char buf[BUFSIZ];
- if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
- ( i < LDAP_VERSION3 ) )
- {
- /* version 2 and lower are disallowed */
- continue;
- }
snprintf(buf, sizeof buf, "%d", i);
val.bv_val = buf;
val.bv_len = strlen( val.bv_val );
*/
int read_root_dse_file( const char *fname )
{
- FILE *fp;
+ struct LDIFFP *fp;
int rc = 0, lineno = 0, lmax = 0;
char *buf = NULL;
- if ( (fp = fopen( fname, "r" )) == NULL ) {
+ if ( (fp = ldif_open( fname, "r" )) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"could not open rootdse attr file \"%s\" - absolute path?\n",
fname, 0, 0 );
if( usr_attr == NULL ) {
Debug( LDAP_DEBUG_ANY,
"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
- fclose( fp );
+ ldif_close( fp );
return LDAP_OTHER;
}
usr_attr->e_attrs = NULL;
ch_free( buf );
- fclose( fp );
+ ldif_close( fp );
Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
return rc;
char *attrs[ 2 ] = { NULL, NULL };
ber_str2bv( val, 0, 0, &bv_val );
- attrs[ 0 ] = attr;
+ attrs[ 0 ] = (char *) attr;
rc = ldap_initialize( &ld, uri );
if ( rc != LDAP_SUCCESS ) {