/* config.c - configuration file handling routines */
+/* $OpenLDAP$ */
/*
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
#include <ac/ctype.h>
#include <ac/socket.h>
-#include "ldap_defaults.h"
+#include "ldap_pvt.h"
#include "slap.h"
#define MAXARGS 100
int deftime = SLAPD_DEFAULT_TIMELIMIT;
AccessControl *global_acl = NULL;
int global_default_access = ACL_READ;
+int global_readonly = 0;
char *replogfile;
int global_lastmod = ON;
int global_idletimeout = 0;
static char *strtok_quote(char *line, char *sep);
int
-read_config( char *fname )
+read_config( const char *fname )
{
FILE *fp;
char *line, *savefname, *saveline;
bi = NULL;
be = backend_db_init( cargv[1] );
- /* assign a default depth limit for alias deref */
- be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH;
-
/* get pid file name */
} else if ( strcasecmp( cargv[0], "pidfile" ) == 0 ) {
if ( cargc < 2 ) {
char *dn = ch_strdup( cargv[1] );
(void) dn_normalize( dn );
charray_add( &be->be_suffix, dn );
- (void) str2upper( dn );
+ (void) ldap_pvt_str2upper( dn );
charray_add( &be->be_nsuffix, dn );
free( dn );
}
return( 1 );
}
if ( be == NULL ) {
- Debug( LDAP_DEBUG_ANY,
-"%s: line %d: readonly line must appear inside a database definition (ignored)\n",
- fname, lineno, 0 );
+ global_readonly = (strcasecmp( cargv[1], "on" ) == 0);
} else {
if ( strcasecmp( cargv[1], "on" ) == 0 ) {
be->be_readonly = 1;
fname, lineno, 0 );
return( 1 );
#endif
+ /* specify an Object Identifier macro */
+ } else if ( strcasecmp( cargv[0], "objectidentifier" ) == 0 ) {
+ parse_oidm( fname, lineno, cargc, cargv );
/* specify an objectclass */
} else if ( strcasecmp( cargv[0], "objectclass" ) == 0 ) {
if ( *cargv[1] == '(' ) {
char * p;
p = strchr(saveline,'(');
- parse_oc( fname, lineno, p );
+ parse_oc( fname, lineno, p, cargv );
} else {
parse_oc_old( be, fname, lineno, cargc, cargv );
}
if ( *cargv[1] == '(' ) {
char * p;
p = strchr(saveline,'(');
- parse_at( fname, lineno, p );
+ parse_at( fname, lineno, p, cargv );
} else {
attr_syntax_config( fname, lineno, cargc - 1,
&cargv[1] );