X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=47b081a2860b1d172716fb1f8f403ef79f7824fb;hb=740f1b422edc48c9eeed8346c45872a63b683370;hp=6017101f636415dd5a6a4a6fefb0270ee524fc0a;hpb=5456f4ed18b4c093a5311d1bae0d11f4e1f53587;p=openldap diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 6017101f63..47b081a286 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1,4 +1,8 @@ /* config.c - configuration file handling routines */ +/* + * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ #include "portable.h" @@ -469,7 +473,7 @@ read_config( char *fname ) str2access(cargv[1]))) ) { Debug( LDAP_DEBUG_ANY, -"%s: line %d: bad access \"%s\" expecting [self]{none|compare|read|write}\n", +"%s: line %d: bad access \"%s\" expecting [self]{none|auth|compare|search|read|write}\n", fname, lineno, cargv[1] ); return( 1 ); } @@ -479,7 +483,7 @@ read_config( char *fname ) { Debug( LDAP_DEBUG_ANY, "%s: line %d: bad access \"%s\", " - "expecting [self]{none|compare|search|read|write}\n", + "expecting [self]{none|auth|compare|search|read|write}\n", fname, lineno, cargv[1] ); return( 1 ); } @@ -655,13 +659,13 @@ read_config( char *fname ) Debug( LDAP_DEBUG_ANY, "%s: line %d: missing filename in \"loadmodule \" line\n", fname, lineno, 0 ); - exit( 1 ); + exit( EXIT_FAILURE ); } - if (!load_module(cargv[1], cargc - 2, (cargc > 2) ? cargv + 2 : NULL)) { + if (load_module(cargv[1], cargc - 2, (cargc > 2) ? cargv + 2 : NULL)) { Debug( LDAP_DEBUG_ANY, "%s: line %d: failed to load or initialize module %s\n", fname, lineno, cargv[1]); - exit( 1 ); + exit( EXIT_FAILURE ); } #endif /*SLAPD_MODULES*/