From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 3 Jan 2015 19:17:58 +0000 (-0500)
Subject: REG_NOSUB is a compile time option only. Likely Closes #868
X-Git-Tag: release_3_0_7~363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=486224cedc30acd4e69ef8948ad7ceb6e5070863;p=thirdparty%2Ffreeradius-server.git

REG_NOSUB is a compile time option only. Likely Closes #868
---

diff --git a/src/lib/regex.c b/src/lib/regex.c
index 07b3210f7f1..aa68836a16b 100644
--- a/src/lib/regex.c
+++ b/src/lib/regex.c
@@ -316,7 +316,6 @@ ssize_t regex_compile(TALLOC_CTX *ctx, regex_t **out, char const *pattern, size_
 int regex_exec(regex_t *preg, char const *subject, size_t len, regmatch_t pmatch[], size_t *nmatch)
 {
 	int	ret;
-	int	eflags = 0;
 	size_t	matches;
 
 	/*
@@ -326,8 +325,8 @@ int regex_exec(regex_t *preg, char const *subject, size_t len, regmatch_t pmatch
 		pmatch = NULL;
 		if (nmatch) *nmatch = 0;
 		matches = 0;
-		eflags |= REG_NOSUB;
 	} else {
+		/* regexec does not seem to initialise unused elements */
 		matches = *nmatch;
 		memset(pmatch, 0, sizeof(pmatch[0]) * matches);
 	}
@@ -344,11 +343,10 @@ int regex_exec(regex_t *preg, char const *subject, size_t len, regmatch_t pmatch
 					   (p - subject));
 			return -1;
 		}
-		/* regexec does not seem to initialise unused elements */
-		ret = regexec(preg, subject, matches, pmatch, eflags);
+		ret = regexec(preg, subject, matches, pmatch, 0);
 	}
 #else
-	ret = regnexec(preg, subject, len, matches, pmatch, eflags);
+	ret = regnexec(preg, subject, len, matches, pmatch, 0);
 #endif
 	if (ret != 0) {
 		if (ret != REG_NOMATCH) {