tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Ignore comments at the end of config lines in ssh_config, 

similar to what we already do for sshd_config.  bz#2320, with & ok djm@

OpenBSD-Commit-ID: bdbf9fc5bc72b1a14266f5f61723ed57307a6db4
This commit is contained in:
dtucker@openbsd.org 2020-11-30 05:36:39 +00:00 committed by Damien Miller
parent b755264e7d
commit 2bcbf679de
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.342 2020/11/15 22:34:58 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.343 2020/11/30 05:36:39 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1899,7 +1899,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
int flags, int *activep, int *want_final_pass, int depth) int flags, int *activep, int *want_final_pass, int depth)
{ {
FILE *f; FILE *f;
char *line = NULL; char *cp, *line = NULL;
size_t linesize = 0; size_t linesize = 0;
int linenum; int linenum;
int bad_options = 0; int bad_options = 0;
@ -1930,6 +1930,13 @@ read_config_file_depth(const char *filename, struct passwd *pw,
while (getline(&line, &linesize, f) != -1) { while (getline(&line, &linesize, f) != -1) {
/* Update line number counter. */ /* Update line number counter. */
linenum++; linenum++;
/*
* Trim out comments and strip whitespace.
* NB - preserve newlines, they are needed to reproduce
* line numbers later for error messages.
*/
if ((cp = strchr(line, '#')) != NULL)
*cp = '\0';
if (process_config_line_depth(options, pw, host, original_host, if (process_config_line_depth(options, pw, host, original_host,
line, filename, linenum, activep, flags, want_final_pass, line, filename, linenum, activep, flags, want_final_pass,
depth) != 0) depth) != 0)