From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 29 May 2015 20:07:24 +0000 (-0400)
Subject: Assert not required and causes warnings with NDEBUG
X-Git-Tag: release_3_0_9~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8f3f8d494ac3a08ccfd9eef3e2f53425d19ade5;p=thirdparty%2Ffreeradius-server.git

Assert not required and causes warnings with NDEBUG
---

diff --git a/src/main/conffile.c b/src/main/conffile.c
index e70c4bf9814..c29b7a2c3d1 100644
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -1155,7 +1155,7 @@ static inline int fr_item_validate_ipaddr(CONF_SECTION *cs, char const *name, PW
 int cf_item_parse(CONF_SECTION *cs, char const *name, unsigned int type, void *data, char const *dflt)
 {
 	int rcode;
-	bool deprecated, required, attribute, secret, file_input, cant_be_empty, tmpl, xlat, multi;
+	bool deprecated, required, attribute, secret, file_input, cant_be_empty, tmpl, multi;
 	char **q;
 	char const *value;
 	CONF_PAIR *cp = NULL;
@@ -1171,7 +1171,6 @@ int cf_item_parse(CONF_SECTION *cs, char const *name, unsigned int type, void *d
 	file_input = (type == PW_TYPE_FILE_INPUT);	/* check, not and */
 	cant_be_empty = (type & PW_TYPE_NOT_EMPTY);
 	tmpl = (type & PW_TYPE_TMPL);
-	xlat = (type & PW_TYPE_XLAT);
 	multi = (type & PW_TYPE_MULTI);
 
 	if (attribute) required = true;
@@ -1260,7 +1259,6 @@ int cf_item_parse(CONF_SECTION *cs, char const *name, unsigned int type, void *d
 		}
 
 		rad_assert(!attribute);
-		rad_assert(!xlat);
 		vpt = tmpl_alloc(cs, TMPL_TYPE_LITERAL, value, strlen(value));
 		*(vp_tmpl_t **)data = vpt;