Strip trailing new lines from exec output

FreeRADIUS · Jan 27, 2014 · 023974a · 023974a
1 parent b5cc0e8
commit 023974a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/exec.c b/src/main/exec.c
@@ -480,6 +480,12 @@ int radius_readfrom_program(REQUEST *request, int fd, pid_t pid, int timeout,
 		if (left <= 0) break;
 	}
 #endif	/* __MINGW32__ */
+
+	/* Strip trailing new lines */
+	while ((done > 0) && (answer[done - 1] == '\n')) {
+		answer[--done] = '\0';
+	}
+
 	return done;
 }
 

diff --git a/src/tests/keywords/update-exec b/src/tests/keywords/update-exec
@@ -16,7 +16,7 @@ update request {
 	Tmp-String-0 := `/bin/sh -c "echo 'foo bar baz'"`
 }
 
-if (Tmp-String-0 != "foo bar baz\n") {
+if (Tmp-String-0 != "foo bar baz") {
 	update reply {
 		Filter-Id += "fail"
 	}