#include <ac/string.h>
#include <ac/ctype.h>
#include <ac/socket.h>
+#include <ac/errno.h>
#include "lutil.h"
#include "ldap_pvt.h"
#include "slap.h"
-#define MAXARGS 200
+#define MAXARGS 500
/*
* defaults for various global variables
if ( (fp = fopen( fname, "r" )) == NULL ) {
ldap_syslog = 1;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "config", LDAP_LEVEL_ENTRY, "read_config: "
+ "could not open config file \"%s\": %s (%d)\n",
+ fname, strerror(errno), errno ));
+#else
Debug( LDAP_DEBUG_ANY,
- "could not open config file \"%s\" - absolute path?\n",
- fname, 0, 0 );
- perror( fname );
+ "could not open config file \"%s\": %s (%d)\n",
+ fname, strerror(errno), errno );
+#endif
return 1;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_ENTRY,
- "read_config: reading config file %s\n", fname ));
+ "read_config: reading config file %s\n", fname ));
#else
Debug( LDAP_DEBUG_CONFIG, "reading config file %s\n", fname, 0, 0 );
#endif
/* set size limit */
} else if ( strcasecmp( cargv[0], "sizelimit" ) == 0 ) {
- int rc = 0;
+ int rc = 0, i;
struct slap_limits_set *lim;
if ( cargc < 2 ) {
lim = &be->be_def_limit;
}
- if ( strncasecmp( cargv[1], "size", 4 ) == 0 ) {
- rc = parse_limit( cargv[1], lim );
- } else {
- lim->lms_s_soft = atoi( cargv[1] );
- lim->lms_s_hard = 0;
- }
+ for ( i = 1; i < cargc; i++ ) {
+ if ( strncasecmp( cargv[i], "size", 4 ) == 0 ) {
+ rc = parse_limit( cargv[i], lim );
+ } else {
+ lim->lms_s_soft = atoi( cargv[i] );
+ lim->lms_s_hard = 0;
+ }
- if ( rc ) {
+ if ( rc ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: unable to parse value"
- " \"%s\" in \"sizelimit <limit>\""
- " line.\n",
- fname, lineno, cargv[1] ));
+ LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+ "%s: line %d: unable "
+ "to parse value \"%s\" "
+ "in \"sizelimit "
+ "<limit>\" line.\n",
+ fname, lineno, cargv[i] ));
#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: unable to parse value \"%s\" in \"sizelimit <limit>\" line\n",
- fname, lineno, cargv[1] );
+ Debug( LDAP_DEBUG_ANY,
+ "%s: line %d: unable "
+ "to parse value \"%s\" "
+ "in \"sizelimit "
+ "<limit>\" line\n",
+ fname, lineno, cargv[i] );
#endif
+ }
}
/* set time limit */
} else if ( strcasecmp( cargv[0], "timelimit" ) == 0 ) {
- int rc = 0;
+ int rc = 0, i;
struct slap_limits_set *lim;
if ( cargc < 2 ) {
lim = &be->be_def_limit;
}
- if ( strncasecmp( cargv[1], "time", 4 ) == 0 ) {
- rc = parse_limit( cargv[1], lim );
- } else {
- lim->lms_t_soft = atoi( cargv[1] );
- lim->lms_t_hard = 0;
- }
+ for ( i = 1; i < cargc; i++ ) {
+ if ( strncasecmp( cargv[i], "time", 4 ) == 0 ) {
+ rc = parse_limit( cargv[i], lim );
+ } else {
+ lim->lms_t_soft = atoi( cargv[i] );
+ lim->lms_t_hard = 0;
+ }
- if ( rc ) {
+ if ( rc ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: unable to parse value"
- " \"%s\" in \"timelimit <limit>\""
- " line.\n",
- fname, lineno, cargv[1] ));
+ LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+ "%s: line %d: unable "
+ "to parse value \"%s\" "
+ "in \"timelimit "
+ "<limit>\" line.\n",
+ fname, lineno, cargv[i] ));
#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: unable to parse value \"%s\" in \"timelimit <limit>\" line\n",
- fname, lineno, cargv[1] );
+ Debug( LDAP_DEBUG_ANY,
+ "%s: line %d: unable "
+ "to parse value \"%s\" "
+ "in \"timelimit "
+ "<limit>\" line\n",
+ fname, lineno, cargv[i] );
#endif
+ }
}
/* set regex-based limits */
if ( strncasecmp( cargv[i], "suffix=", 7 ) == 0 ) {
char *nsuffix = ch_strdup( cargv[i] + 7 );
if ( dn_normalize( nsuffix ) != NULL ) {
- if ( be_issuffix( be, nsuffix ) ) {
+ if ( select_backend( nsuffix, 0 ) == be ) {
charray_add( &be->be_replica[nr]->ri_nsuffix, nsuffix );
} else {
#ifdef NEW_LOGGING
#endif /*SLAPD_MODULES*/
#ifdef HAVE_TLS
- } else if ( !strcasecmp( cargv[0], "TLSProtocol" ) ) {
- rc = ldap_pvt_tls_set_option( NULL,
- LDAP_OPT_X_TLS_PROTOCOL,
- cargv[1] );
- if ( rc )
- return rc;
-
} else if ( !strcasecmp( cargv[0], "TLSRandFile" ) ) {
rc = ldap_pvt_tls_set_option( NULL,
LDAP_OPT_X_TLS_RANDOM_FILE,
}
while ( fgets( buf, sizeof(buf), fp ) != NULL ) {
+ /* trim off \r\n or \n */
if ( (p = strchr( buf, '\n' )) != NULL ) {
+ if( p > buf && p[-1] == '\r' ) --p;
*p = '\0';
}
if ( ! isspace( (unsigned char) buf[0] ) ) {