- (djm) OpenBSD CVS Sync

   - djm@cvs.openbsd.org 2003/04/09 12:00:37
     [readconf.c]
     strip trailing whitespace from config lines before parsing.
     Fixes bz 528; ok markus@

2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 44ec8f4f0..442c0681a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 20030514
  - (djm) Bug #117: Don't lie to PAM about username
  - (djm) RCSID sync w/ OpenBSD
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2003/04/09 12:00:37
+     [readconf.c]
+     strip trailing whitespace from config lines before parsing. 
+     Fixes bz 528; ok markus@
 
 20030512
  - (djm) Redhat spec: Don't install profile.d scripts when not 
@@ -1388,4 +1393,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2677 2003/05/14 03:40:06 djm Exp $
+$Id: ChangeLog,v 1.2678 2003/05/14 03:40:54 djm Exp $
diff --git a/readconf.c b/readconf.c
index a10427086..acdf128f6 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.105 2003/04/02 09:48:07 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.106 2003/04/09 12:00:37 djm Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -282,6 +282,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);