/* config.c - configuration file handling routines */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
Debug( LDAP_DEBUG_CONFIG, "reading config file %s\n", fname, 0, 0 );
- if ( schema_init( ) != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "error initializing the schema\n",
- 0, 0, 0 );
- return( 1 );
- }
-
fp_getline_init( &lineno );
while ( (line = fp_getline( fp, &lineno )) != NULL ) {
p = strchr(saveline,'(');
parse_oc( fname, lineno, p, cargv );
} else {
-#ifdef SLAPD_SCHEMA_COMPAT
- parse_oc_old( be, fname, lineno, cargc, cargv );
-#else
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
Debug( LDAP_DEBUG_ANY,
"%s: line %d: old objectclass format not supported.\n",
fname, lineno, 0 );
+#else
+ parse_oc_old( be, fname, lineno, cargc, cargv );
#endif
}
p = strchr(saveline,'(');
parse_at( fname, lineno, p, cargv );
} else {
-#ifdef SLAPD_SCHEMA_COMPAT
- attr_syntax_config( fname, lineno, cargc - 1,
- &cargv[1] );
-#else
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
Debug( LDAP_DEBUG_ANY,
"%s: line %d: old attribute type format not supported.\n",
fname, lineno, 0 );
+#else
+ at_config( fname, lineno, cargc - 1,
+ &cargv[1] );
#endif
}