]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Turn colorize off only if it was one
authorAlan T. DeKok <aland@freeradius.org>
Mon, 18 Feb 2013 16:32:23 +0000 (11:32 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Mon, 18 Feb 2013 17:18:55 +0000 (12:18 -0500)
src/main/mainconfig.c

index 4f4d5f052fdabea1f76b52d22672bfffb0e108cc..bf1ddde60b691a8df9b1038cdbeb33ae8a1a0645 100644 (file)
@@ -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;