tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) OpenBSD CVS Sync

Browse Source 
- 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@
This commit is contained in:
Damien Miller 2003-05-14 13:40:54 +10:00
parent d558092522
commit c652cac5f7
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,6 +1,11 @@
20030514 20030514
- (djm) Bug #117: Don't lie to PAM about username - (djm) Bug #117: Don't lie to PAM about username
- (djm) RCSID sync w/ OpenBSD - (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 20030512
- (djm) Redhat spec: Don't install profile.d scripts when not - (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; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ 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 $

9
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -282,6 +282,13 @@ process_config_line(Options *options, const char *host,
u_short fwd_port, fwd_host_port; u_short fwd_port, fwd_host_port;
char sfwd_host_port[6]; 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; s = line;
/* Get the keyword. (Each line is supposed to begin with a keyword). */ /* Get the keyword. (Each line is supposed to begin with a keyword). */
keyword = strdelim(&s); keyword = strdelim(&s);