summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-11-30 05:36:39 +0000
committerDamien Miller <djm@mindrot.org>2020-12-04 13:42:38 +1100
commit2bcbf679de838bb77a8bd7fa18e100df471a679c (patch)
treed9cd1cc34e9b0f2b36080069b0bcaa39dd0152e3 /readconf.c
parentb755264e7d3cdf1de34e18df1af4efaa76a3c015 (diff)
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
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 09b5e086..d60eeacf 100644
--- a/readconf.c
+++ b/readconf.c
@@ -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>
* 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)
{
FILE *f;
- char *line = NULL;
+ char *cp, *line = NULL;
size_t linesize = 0;
int linenum;
int bad_options = 0;
@@ -1930,6 +1930,13 @@ read_config_file_depth(const char *filename, struct passwd *pw,
while (getline(&line, &linesize, f) != -1) {
/* Update line number counter. */
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,
line, filename, linenum, activep, flags, want_final_pass,
depth) != 0)