summaryrefslogtreecommitdiffstats
path: root/readconf.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:20:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:20:57 +0000
commitd1667913ba37d7f61712e06dd6dd4919fe36a053 (patch)
tree3b79bcd5316ce3cc395ffa0275b54faded8b2b92 /readconf.h
parentReleasing progress-linux version 1:9.6p1-5~progress7.99u1. (diff)
downloadopenssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.tar.xz
openssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.zip
Merging upstream version 1:9.7p1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/readconf.h b/readconf.h
index ff7180c..9447d5d 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.154 2023/10/12 02:18:18 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.156 2024/03/04 02:16:11 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -87,7 +87,7 @@ typedef struct {
char *sk_provider; /* Security key provider */
int verify_host_key_dns; /* Verify host key using DNS */
- int num_identity_files; /* Number of files for RSA/DSA identities. */
+ int num_identity_files; /* Number of files for identities. */
char *identity_files[SSH_MAX_IDENTITY_FILES];
int identity_file_userprovided[SSH_MAX_IDENTITY_FILES];
struct sshkey *identity_keys[SSH_MAX_IDENTITY_FILES];
@@ -155,12 +155,12 @@ typedef struct {
int proxy_use_fdpass;
int num_canonical_domains;
- char *canonical_domains[MAX_CANON_DOMAINS];
+ char **canonical_domains;
int canonicalize_hostname;
int canonicalize_max_dots;
int canonicalize_fallback_local;
int num_permitted_cnames;
- struct allowed_cname permitted_cnames[MAX_CANON_DOMAINS];
+ struct allowed_cname *permitted_cnames;
char *revoked_host_keys;