X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=40be0f7ba59d982177f86d8ff6ad259c8128d7b6;hb=5631f25839a4a83521993639a96909267ea7bce6;hp=0af0616762109d930c4f1b7d5ad1314606fabb66;hpb=54de0cbffccffebac71e218e790d66cade12d453;p=openldap

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 0af0616762..40be0f7ba5 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -34,6 +34,10 @@
 #include <ac/socket.h>
 #include <ac/errno.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include "slap.h"
 #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"
@@ -78,8 +82,6 @@ static int fp_parse_line(ConfigArgs *c);
 
 static char	*strtok_quote(char *line, char *sep, char **quote_ptr);
 
-int read_config_file(const char *fname, int depth, ConfigArgs *cf);
-
 ConfigArgs *
 new_config_args( BackendDB *be, const char *fname, int lineno, int argc, char **argv )
 {
@@ -91,7 +93,7 @@ new_config_args( BackendDB *be, const char *fname, int lineno, int argc, char **
 	c->argc   = argc;
 	c->argv   = argv; 
 	c->lineno = lineno;
-	snprintf( c->log, sizeof( c->log ), "%s: line %lu", fname, lineno );
+	snprintf( c->log, sizeof( c->log ), "%s: line %d", fname, lineno );
 	return(c);
 }
 
@@ -134,9 +136,19 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
 		return(ARG_BAD_CONF);
 	}
 	if(Conf->max_args && (c->argc > Conf->max_args)) {
-		sprintf( c->msg, "<%s> extra cruft after <%s> ignored",
+		char	*ignored = " ignored";
+
+		sprintf( c->msg, "<%s> extra cruft after <%s>",
 			c->argv[0], Conf->what );
-		Debug(LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 );
+
+#ifdef LDAP_DEVEL
+		ignored = "";
+#endif /* LDAP_DEVEL */
+		Debug(LDAP_DEBUG_CONFIG, "%s: %s%s.\n",
+				c->log, c->msg, ignored );
+#ifdef LDAP_DEVEL
+		return(ARG_BAD_CONF);
+#endif /* LDAP_DEVEL */
 	}
 	if((arg_type & ARG_DB) && !c->be) {
 		sprintf( c->msg, "<%s> only allowed within database declaration",
@@ -240,7 +252,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
 
 int config_set_vals(ConfigTable *Conf, ConfigArgs *c) {
 	int rc, arg_type;
-	void *ptr;
+	void *ptr = NULL;
 
 	arg_type = Conf->arg_type;
 	if(arg_type & ARG_MAGIC) {
@@ -415,6 +427,8 @@ init_config_attrs(ConfigTable *ct) {
 	const char *err;
 
 	for (i=0; ct[i].name; i++ ) {
+		int		freeit = 0;
+
 		if ( !ct[i].attribute ) continue;
 		at = ldap_str2attributetype( ct[i].attribute,
 			&code, &err, LDAP_SCHEMA_ALLOW_ALL );
@@ -423,19 +437,29 @@ init_config_attrs(ConfigTable *ct) {
 				ct[i].attribute, ldap_scherr2str(code), err );
 			return code;
 		}
+
 		code = at_add( at, 0, NULL, &err );
-		if ( code && code != SLAP_SCHERR_ATTR_DUP ) {
-			fprintf( stderr, "init_config_attrs: AttributeType \"%s\": %s, %s\n",
-				ct[i].attribute, scherr2str(code), err );
-			return code;
+		if ( code ) {
+			if ( code == SLAP_SCHERR_ATTR_DUP ) {
+				freeit = 1;
+
+			} else {
+				fprintf( stderr, "init_config_attrs: AttributeType \"%s\": %s, %s\n",
+					ct[i].attribute, scherr2str(code), err );
+				return code;
+			}
 		}
 		code = slap_str2ad( at->at_names[0], &ct[i].ad, &err );
+		if ( freeit ) {
+			ldap_attributetype_free( at );
+		} else {
+			ldap_memfree( at );
+		}
 		if ( code ) {
 			fprintf( stderr, "init_config_attrs: AttributeType \"%s\": %s\n",
 				ct[i].attribute, err );
 			return code;
 		}
-		ldap_memfree( at );
 	}
 
 	return 0;
@@ -445,27 +469,25 @@ int
 init_config_ocs( ConfigOCs *ocs ) {
 	int i;
 
-	for (i=0;ocs[i].def;i++) {
+	for (i=0;ocs[i].co_def;i++) {
 		LDAPObjectClass *oc;
 		int code;
 		const char *err;
 
-		oc = ldap_str2objectclass( ocs[i].def, &code, &err,
+		oc = ldap_str2objectclass( ocs[i].co_def, &code, &err,
 			LDAP_SCHEMA_ALLOW_ALL );
 		if ( !oc ) {
 			fprintf( stderr, "init_config_ocs: objectclass \"%s\": %s, %s\n",
-				ocs[i].def, ldap_scherr2str(code), err );
+				ocs[i].co_def, ldap_scherr2str(code), err );
 			return code;
 		}
 		code = oc_add(oc,0,NULL,&err);
 		if ( code && code != SLAP_SCHERR_CLASS_DUP ) {
 			fprintf( stderr, "init_config_ocs: objectclass \"%s\": %s, %s\n",
-				ocs[i].def, scherr2str(code), err );
+				ocs[i].co_def, scherr2str(code), err );
 			return code;
 		}
-		if ( ocs[i].oc ) {
-			*ocs[i].oc = oc_find(oc->oc_names[0]);
-		}
+		ocs[i].co_oc = oc_find(oc->oc_names[0]);
 		ldap_memfree(oc);
 	}
 	return 0;
@@ -474,17 +496,34 @@ init_config_ocs( ConfigOCs *ocs ) {
 int
 config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx)
 {
-	int rc = 0;
+	int 	rc = 0;
+	char	*saveline = NULL;
 
 	snprintf( c->log, sizeof( c->log ), "%s: value #%d",
 		ct->ad->ad_cname.bv_val, valx );
 	c->argc = 1;
 	c->argv[0] = ct->ad->ad_cname.bv_val;
+
+	if ( ( ct->arg_type & ARG_QUOTE ) && c->line[ 0 ] != '"' ) {
+		ber_len_t	len;
+
+		saveline = c->line;
+		len = strlen( c->line );
+		c->line = ch_malloc( len + STRLENOF( "\"\"" ) + 1 );
+		sprintf( c->line, "\"%s\"", saveline );
+	}
+
 	if ( fp_parse_line( c ) ) {
 		rc = 1;
 	} else {
 		rc = config_check_vals( ct, c, 1 );
 	}
+
+	if ( saveline ) {
+		ch_free( c->line );
+		c->line = saveline;
+	}
+
 	if ( rc )
 		rc = LDAP_CONSTRAINT_VIOLATION;
 
@@ -495,12 +534,24 @@ config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx)
 int
 config_parse_add(ConfigTable *ct, ConfigArgs *c)
 {
-	int rc = 0;
+	int	rc = 0;
+	char	*saveline = NULL;
 
 	snprintf( c->log, sizeof( c->log ), "%s: value #%d",
 		ct->ad->ad_cname.bv_val, c->valx );
 	c->argc = 1;
 	c->argv[0] = ct->ad->ad_cname.bv_val;
+
+	if ( ( ct->arg_type & ARG_QUOTE ) && c->line[ 0 ] != '"' ) {
+		ber_len_t	len;
+
+		saveline = c->line;
+		len = strlen( c->line );
+			
+		c->line = ch_malloc( len + STRLENOF( "\"\"" ) + 1 );
+		sprintf( c->line, "\"%s\"", saveline );
+	}
+
 	if ( fp_parse_line( c ) ) {
 		rc = 1;
 	} else {
@@ -508,17 +559,23 @@ config_parse_add(ConfigTable *ct, ConfigArgs *c)
 		rc = config_add_vals( ct, c );
 	}
 
+	if ( saveline ) {
+		ch_free( c->line );
+		c->line = saveline;
+	}
+
 	ch_free( c->tline );
 	return rc;
 }
 
 int
-read_config_file(const char *fname, int depth, ConfigArgs *cf)
+read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
 {
 	FILE *fp;
 	ConfigTable *ct;
 	ConfigArgs *c;
 	int rc;
+	struct stat s;
 
 	c = ch_calloc( 1, sizeof( ConfigArgs ) );
 	if ( c == NULL ) {
@@ -537,6 +594,22 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
 	c->fname = fname;
 	init_config_argv( c );
 
+	if ( stat( fname, &s ) != 0 ) {
+		ldap_syslog = 1;
+		Debug(LDAP_DEBUG_ANY,
+		    "could not stat config file \"%s\": %s (%d)\n",
+		    fname, strerror(errno), errno);
+		return(1);
+	}
+
+	if ( !S_ISREG( s.st_mode ) ) {
+		ldap_syslog = 1;
+		Debug(LDAP_DEBUG_ANY,
+		    "regular file expected, got \"%s\"\n",
+		    fname, 0, 0 );
+		return(1);
+	}
+
 	fp = fopen( fname, "r" );
 	if ( fp == NULL ) {
 		ldap_syslog = 1;
@@ -558,7 +631,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
 			continue;
 		}
 
-		snprintf( c->log, sizeof( c->log ), "%s: line %lu",
+		snprintf( c->log, sizeof( c->log ), "%s: line %d",
 				c->fname, c->lineno );
 
 		c->argc = 0;
@@ -582,7 +655,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
 
 		c->op = SLAP_CONFIG_ADD;
 
-		ct = config_find_keyword( config_back_cf_table, c );
+		ct = config_find_keyword( cft, c );
 		if ( ct ) {
 			rc = config_add_vals( ct, c );
 			if ( !rc ) continue;
@@ -599,10 +672,10 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
 				goto leave;
 			}
 			
-		} else if ( c->bi ) {
+		} else if ( c->bi && !c->be ) {
 			rc = SLAP_CONF_UNKNOWN;
-			if ( c->bi->bi_cf_table ) {
-				ct = config_find_keyword( c->bi->bi_cf_table, c );
+			if ( c->bi->bi_cf_ocs ) {
+				ct = config_find_keyword( c->bi->bi_cf_ocs->co_table, c );
 				if ( ct ) {
 					rc = config_add_vals( ct, c );
 				}
@@ -629,8 +702,8 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
 
 		} else if ( c->be ) {
 			rc = SLAP_CONF_UNKNOWN;
-			if ( c->be->be_cf_table ) {
-				ct = config_find_keyword( c->be->be_cf_table, c );
+			if ( c->be->be_cf_ocs ) {
+				ct = config_find_keyword( c->be->be_cf_ocs->co_table, c );
 				if ( ct ) {
 					rc = config_add_vals( ct, c );
 				}
@@ -687,18 +760,6 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
 		}
 	}
 
-	if ( BER_BVISNULL( &frontendDB->be_schemadn ) ) {
-		ber_str2bv( SLAPD_SCHEMA_DN, STRLENOF( SLAPD_SCHEMA_DN ), 1,
-			&frontendDB->be_schemadn );
-		rc = dnNormalize( 0, NULL, NULL, &frontendDB->be_schemadn, &frontendDB->be_schemandn, NULL );
-		if ( rc != LDAP_SUCCESS ) {
-			Debug(LDAP_DEBUG_ANY, "%s: "
-				"unable to normalize default schema DN \"%s\"\n",
-				c->log, frontendDB->be_schemadn.bv_val, 0 );
-			/* must not happen */
-			assert( 0 );
-		}
-	}
 	rc = 0;
 
 leave:
@@ -732,6 +793,9 @@ verbs_to_mask(int argc, char *argv[], slap_verbmasks *v, slap_mask_t *m) {
 	return(0);
 }
 
+/* Mask keywords that represent multiple bits should occur before single
+ * bit keywords in the verbmasks array.
+ */
 int
 mask_to_verbs(slap_verbmasks *v, slap_mask_t m, BerVarray *bva) {
 	int i;
@@ -741,11 +805,116 @@ mask_to_verbs(slap_verbmasks *v, slap_mask_t m, BerVarray *bva) {
 		if (!v[i].mask) continue;
 		if (( m & v[i].mask ) == v[i].mask ) {
 			value_add_one( bva, &v[i].word );
+			m ^= v[i].mask;
+			if ( !m ) break;
 		}
 	}
 	return 0;
 }
 
+int
+slap_verbmasks_init( slap_verbmasks **vp, slap_verbmasks *v )
+{
+	int		i;
+
+	assert( *vp == NULL );
+
+	for ( i = 0; !BER_BVISNULL( &v[ i ].word ); i++ )
+		;
+
+	*vp = ch_calloc( i + 1, sizeof( slap_verbmasks ) );
+
+	for ( i = 0; !BER_BVISNULL( &v[ i ].word ); i++ ) {
+		ber_dupbv( &(*vp)[ i ].word, &v[ i ].word );
+		*((slap_mask_t *)&(*vp)[ i ].mask) = v[ i ].mask;
+	}
+
+	BER_BVZERO( &(*vp)[ i ].word );
+
+	return 0;		
+}
+
+int
+slap_verbmasks_destroy( slap_verbmasks *v )
+{
+	int		i;
+
+	assert( v != NULL );
+
+	for ( i = 0; !BER_BVISNULL( &v[ i ].word ); i++ ) {
+		ch_free( v[ i ].word.bv_val );
+	}
+
+	ch_free( v );
+
+	return 0;
+}
+
+int
+slap_verbmasks_append(
+	slap_verbmasks	**vp,
+	slap_mask_t	m,
+	struct berval	*v,
+	slap_mask_t	*ignore )
+{
+	int	i;
+
+	if ( !m ) {
+		return LDAP_OPERATIONS_ERROR;
+	}
+
+	for ( i = 0; !BER_BVISNULL( &(*vp)[ i ].word ); i++ ) {
+		if ( !(*vp)[ i ].mask ) continue;
+
+		if ( ignore != NULL ) {
+			int	j;
+
+			for ( j = 0; ignore[ j ] != 0; j++ ) {
+				if ( (*vp)[ i ].mask == ignore[ j ] ) {
+					goto check_next;
+				}
+			}
+		}
+
+		if ( ( m & (*vp)[ i ].mask ) == (*vp)[ i ].mask ) {
+			if ( ber_bvstrcasecmp( v, &(*vp)[ i ].word ) == 0 ) {
+				/* already set; ignore */
+				return LDAP_SUCCESS;
+			}
+			/* conflicts */
+			return LDAP_TYPE_OR_VALUE_EXISTS;
+		}
+
+		if ( m & (*vp)[ i ].mask ) {
+			/* conflicts */
+			return LDAP_CONSTRAINT_VIOLATION;
+		}
+check_next:;
+	}
+
+	*vp = ch_realloc( *vp, sizeof( slap_verbmasks ) * ( i + 2 ) );
+	ber_dupbv( &(*vp)[ i ].word, v );
+	*((slap_mask_t *)&(*vp)[ i ].mask) = m;
+	BER_BVZERO( &(*vp)[ i + 1 ].word );
+
+	return LDAP_SUCCESS;
+}
+
+int
+enum_to_verb(slap_verbmasks *v, slap_mask_t m, struct berval *bv) {
+	int i;
+
+	for (i=0; !BER_BVISNULL(&v[i].word); i++) {
+		if ( m == v[i].mask ) {
+			if ( bv != NULL ) {
+				*bv = v[i].word;
+			}
+			return i;
+		}
+	}
+	return -1;
+}
+
 static slap_verbmasks tlskey[] = {
 	{ BER_BVC("no"),	SB_TLS_OFF },
 	{ BER_BVC("yes"),	SB_TLS_ON },
@@ -754,9 +923,7 @@ static slap_verbmasks tlskey[] = {
 };
 
 static slap_verbmasks methkey[] = {
-#if 0
 	{ BER_BVC("none"),	LDAP_AUTH_NONE },
-#endif
 	{ BER_BVC("simple"),	LDAP_AUTH_SIMPLE },
 #ifdef HAVE_CYRUS_SASL
 	{ BER_BVC("sasl"),	LDAP_AUTH_SASL },
@@ -808,7 +975,7 @@ int bindconf_parse( const char *word, slap_bindconf *bc ) {
 				break;
 
 			case 'd':
-				assert( tab->aux );
+				assert( tab->aux != NULL );
 				iptr = (int *)((char *)bc + tab->off);
 
 				rc = 1;
@@ -861,7 +1028,7 @@ int bindconf_unparse( slap_bindconf *bc, struct berval *bv ) {
 			break;
 
 		case 'd':
-			assert( tab->aux );
+			assert( tab->aux != NULL );
 			iptr = (int *)((char *)bc + tab->off);
 		
 			for ( i = 0; !BER_BVISNULL( &tab->aux[i].word ); i++ ) {
@@ -1044,30 +1211,39 @@ static int
 fp_parse_line(ConfigArgs *c)
 {
 	char *token;
-	char *hide[] = { "rootpw", "replica", "bindpw", "pseudorootpw", "dbpasswd", '\0' };
+	static char *const hide[] = {
+		"rootpw", "replica", "syncrepl",  /* in slapd */
+		"acl-bind", "acl-method", "idassert-bind",  /* in back-ldap */
+		"acl-passwd", "bindpw",  /* in back-<ldap/meta> */
+		"pseudorootpw",  /* in back-meta */
+		"dbpasswd",  /* in back-sql */
+		NULL
+	};
 	char *quote_ptr;
-	int i;
+	int i = (int)(sizeof(hide)/sizeof(hide[0])) - 1;
 
 	c->tline = ch_strdup(c->line);
 	token = strtok_quote(c->tline, " \t", &quote_ptr);
 
 	if(token) for(i = 0; hide[i]; i++) if(!strcasecmp(token, hide[i])) break;
 	if(quote_ptr) *quote_ptr = ' ';
-	Debug(LDAP_DEBUG_CONFIG, "line %lu (%s%s)\n", c->lineno,
+	Debug(LDAP_DEBUG_CONFIG, "line %d (%s%s)\n", c->lineno,
 		hide[i] ? hide[i] : c->line, hide[i] ? " ***" : "");
 	if(quote_ptr) *quote_ptr = '\0';
 
-	for(; token; token = strtok_quote(NULL, " \t", &quote_ptr)) {
-		if(c->argc == c->argv_size - 1) {
+	for(;; token = strtok_quote(NULL, " \t", &quote_ptr)) {
+		if(c->argc >= c->argv_size) {
 			char **tmp;
 			tmp = ch_realloc(c->argv, (c->argv_size + ARGS_STEP) * sizeof(*c->argv));
 			if(!tmp) {
-				Debug(LDAP_DEBUG_ANY, "line %lu: out of memory\n", c->lineno, 0, 0);
+				Debug(LDAP_DEBUG_ANY, "line %d: out of memory\n", c->lineno, 0, 0);
 				return -1;
 			}
 			c->argv = tmp;
 			c->argv_size += ARGS_STEP;
 		}
+		if(token == NULL)
+			break;
 		c->argv[c->argc++] = token;
 	}
 	c->argv[c->argc] = NULL;
@@ -1152,10 +1328,10 @@ int config_generic_wrapper( Backend *be, const char *fname, int lineno,
 	c.argc = argc;
 	c.argv = argv;
 	c.valx = -1;
-	sprintf( c.log, "%s: line %lu", fname, lineno );
+	sprintf( c.log, "%s: line %d", fname, lineno );
 
 	rc = SLAP_CONF_UNKNOWN;
-	ct = config_find_keyword( be->be_cf_table, &c );
+	ct = config_find_keyword( be->be_cf_ocs->co_table, &c );
 	if ( ct )
 		rc = config_add_vals( ct, &c );
 	return rc;