Trim off newlines and returns

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 5f55a7f800ce9ec8c0b451fe88ca5547ce9d3fee..8875f2810dbb0d0658f68b90568e3b36e6740b6c 100644 (file)
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -274,6 +274,7 @@ static int exec_dispatch(void *instance, REQUEST *request)
        VALUE_PAIR      **input_pairs, **output_pairs;
        VALUE_PAIR      *answer = NULL;
        char            msg[1024];
+       size_t          len;
 
        /*
         *      We need a program to execute.
@@ -362,6 +363,12 @@ static int exec_dispatch(void *instance, REQUEST *request)
         *      Write any exec output to module failure message
         */
        if (*msg) {
+               /* Trim off returns and newlines */
+               len = strlen(msg);
+               if (msg[len - 1] == '\n' || msg[len - 1] == '\r') {
+                       msg[len - 1] = '\0';
+               }
+               
                module_failure_msg(request, "rlm_exec (%s): %s",
                                   inst->xlat_name, msg);
        }