From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 18 Feb 2013 16:32:23 +0000 (-0500)
Subject: Turn colorize off only if it was one
X-Git-Tag: release_3_0_0_beta1~1048
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa07dd2611533680b26ee9a39de935973d07000;p=thirdparty%2Ffreeradius-server.git

Turn colorize off only if it was one
---

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index 4f4d5f052fd..bf1ddde60b6 100644
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -885,7 +885,8 @@ int read_mainconfig(int reload)
 
 	/* Check whether it's appropriate to colourise log output */
 	p = getenv("TERM");
-	if (!(((mainconfig.radlog_dest == RADLOG_STDOUT) ||
+	if (mainconfig.colourise &&
+	    !(((mainconfig.radlog_dest == RADLOG_STDOUT) ||
 	      (mainconfig.radlog_dest == RADLOG_STDERR)) &&
 	      isatty(mainconfig.radlog_fd) && p && strstr(p, "xterm"))) {
 		mainconfig.colourise = FALSE;