Add PW_TYPE_MULTI

For CONF_PAIRs which can exist multiple times in a CONF_SECTION
FreeRADIUS · Sep 23, 2014 · c136883 · c136883
1 parent 6de4c77
commit c136883
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/include/conffile.h b/src/include/conffile.h
@@ -120,6 +120,7 @@ typedef struct timeval _timeval_t;
 #define PW_TYPE_FILE_OUTPUT	((1 << 15) | PW_TYPE_STRING)
 
 #define PW_TYPE_XLAT		(1 << 16)	//!< string will be dynamically expanded
+#define PW_TYPE_MULTI		(1 << 17)	//!< CONF_PAIR can have multiple copies
 
 #define FR_INTEGER_COND_CHECK(_name, _var, _cond, _new)\
 do {\

diff --git a/src/main/conffile.c b/src/main/conffile.c
@@ -1478,6 +1478,8 @@ int cf_section_parse_pass2(CONF_SECTION *cs, UNUSED void *base,
 		if ((variables[i].type & PW_TYPE_XLAT) == 0) continue;
 
 		cp = cf_pair_find(cs, variables[i].name);
+
+	redo:
 		if (!cp || !cp->value) continue;
 
 		if ((cp->value_type != T_DOUBLE_QUOTED_STRING) &&
@@ -1505,6 +1507,14 @@ int cf_section_parse_pass2(CONF_SECTION *cs, UNUSED void *base,
 
 		talloc_free(value);
 		talloc_free(xlat);
+
+		/*
+		 *	If the "multi" flag is set, check all of them.
+		 */
+		if ((variables[i].type & PW_TYPE_MULTI) != 0) {
+			cp = cf_pair_find_next(cs, cp, cp->attr);
+			goto redo;
+		}
 	} /* for all variables in the configuration section */
 
 	return 0;