1 files changed, 7 insertions, 0 deletions

diff --git a/readconf.c b/readconf.c
index 18f7dae8a..899ff3f0e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -286,6 +286,13 @@ process_config_line(Options *options, const char *host,
         u_short fwd_port, fwd_host_port;
         char sfwd_host_port[6];
 
+        /* Strip trailing whitespace */
+        for(len = strlen(line) - 1; len > 0; len--) {
+                if (strchr(WHITESPACE, line[len]) == NULL)
+                        break;
+                line[len] = '\0';
+        }
+
         s = line;
         /* Get the keyword. (Each line is supposed to begin with a keyword). */
         keyword = strdelim(&s);