summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2019-06-05 06:41:44 +0100
committerColin Watson <cjwatson@debian.org>2019-06-05 06:41:44 +0100
commit102062f825fb26a74295a1c089c00c4c4c76b68a (patch)
tree3db66bc8c8483cce66516dff36f6ef56065143d9 /readconf.h
parent3d246f10429fc9a37b98eabef94fe8dc7c61002b (diff)
parentfd0fa130ecf06d7d092932adcd5d77f1549bfc8d (diff)
Import openssh_8.0p1.orig.tar.gz
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/readconf.h b/readconf.h
index fc7e38251..8e36bf32a 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.128 2018/09/20 03:30:44 djm Exp $ */ 1/* $OpenBSD: readconf.h,v 1.129 2018/11/23 05:08:07 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -185,7 +185,7 @@ typedef struct {
185 185
186#define SSHCONF_CHECKPERM 1 /* check permissions on config file */ 186#define SSHCONF_CHECKPERM 1 /* check permissions on config file */
187#define SSHCONF_USERCONF 2 /* user provided config file not system */ 187#define SSHCONF_USERCONF 2 /* user provided config file not system */
188#define SSHCONF_POSTCANON 4 /* After hostname canonicalisation */ 188#define SSHCONF_FINAL 4 /* Final pass over config, after canon. */
189#define SSHCONF_NEVERMATCH 8 /* Match/Host never matches; internal only */ 189#define SSHCONF_NEVERMATCH 8 /* Match/Host never matches; internal only */
190 190
191#define SSH_UPDATE_HOSTKEYS_NO 0 191#define SSH_UPDATE_HOSTKEYS_NO 0
@@ -203,7 +203,7 @@ void fill_default_options_for_canonicalization(Options *);
203int process_config_line(Options *, struct passwd *, const char *, 203int process_config_line(Options *, struct passwd *, const char *,
204 const char *, char *, const char *, int, int *, int); 204 const char *, char *, const char *, int, int *, int);
205int read_config_file(const char *, struct passwd *, const char *, 205int read_config_file(const char *, struct passwd *, const char *,
206 const char *, Options *, int); 206 const char *, Options *, int, int *);
207int parse_forward(struct Forward *, const char *, int, int); 207int parse_forward(struct Forward *, const char *, int, int);
208int parse_jump(const char *, Options *, int); 208int parse_jump(const char *, Options *, int);
209int parse_ssh_uri(const char *, char **, char **, int *); 209int parse_ssh_uri(const char *, char **, char **, int *);