summaryrefslogtreecommitdiffstats
path: root/servconf.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2021-03-12 05:08:19 +0100
committerDarren Tucker <dtucker@dtucker.net>2021-03-13 03:14:13 +0100
commit88057eb6df912abf2678ea5c846d9d9cbc92752c (patch)
tree7eae3d98c66cb57b8433b83d2e50aa63a47a3368 /servconf.h
parentupstream: pwcopy() struct passwd that we're going to reuse across a (diff)
downloadopenssh-88057eb6df912abf2678ea5c846d9d9cbc92752c.tar.xz
openssh-88057eb6df912abf2678ea5c846d9d9cbc92752c.zip
upstream: Add ModuliFile keyword to sshd_config to specify the
location of the "moduli" file containing the groups for DH-GEX. This will allow us to run tests against arbitrary moduli files without having to install them. ok djm@ OpenBSD-Commit-ID: 8df99d60b14ecaaa28f3469d01fc7f56bff49f66
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 4f4fd9ba4..3ce9284fe 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.151 2021/01/26 05:32:21 dtucker Exp $ */
+/* $OpenBSD: servconf.h,v 1.152 2021/03/12 04:08:19 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -93,6 +93,7 @@ typedef struct {
char *host_key_agent; /* ssh-agent socket for host keys. */
char *pid_file; /* Where to put our pid */
+ char *moduli_file; /* moduli file for DH-GEX */
int login_grace_time; /* Disconnect if no auth in this time
* (sec). */
int permit_root_login; /* PERMIT_*, see above */