summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-20 13:21:52 +1000
committerDamien Miller <djm@mindrot.org>2013-07-20 13:21:52 +1000
commit85b45e09188e7a7fc8f0a900a4c6a0f04a5720a7 (patch)
tree575942d7e7a835c3b89b59eb0e9e0ecf34f1811b /servconf.h
parentd93340cbb6bc0fc0dbd4427e0cec6d994a494dd9 (diff)
- markus@cvs.openbsd.org 2013/07/19 07:37:48
[auth.h kex.h kexdhs.c kexecdhs.c kexgexs.c monitor.c servconf.c] [servconf.h session.c sshd.c sshd_config.5] add ssh-agent(1) support to sshd(8); allows encrypted hostkeys, or hostkeys on smartcards; most of the work by Zev Weiss; bz #1974 ok djm@
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 fc051bd4b..98aad8ba2 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.108 2013/05/16 04:09:14 dtucker Exp $ */ 1/* $OpenBSD: servconf.h,v 1.109 2013/07/19 07:37:48 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -65,6 +65,7 @@ typedef struct {
65 int num_host_key_files; /* Number of files for host keys. */ 65 int num_host_key_files; /* Number of files for host keys. */
66 char *host_cert_files[MAX_HOSTCERTS]; /* Files containing host certs. */ 66 char *host_cert_files[MAX_HOSTCERTS]; /* Files containing host certs. */
67 int num_host_cert_files; /* Number of files for host certs. */ 67 int num_host_cert_files; /* Number of files for host certs. */
68 char *host_key_agent; /* ssh-agent socket for host keys. */
68 char *pid_file; /* Where to put our pid */ 69 char *pid_file; /* Where to put our pid */
69 int server_key_bits;/* Size of the server key. */ 70 int server_key_bits;/* Size of the server key. */
70 int login_grace_time; /* Disconnect if no auth in this time 71 int login_grace_time; /* Disconnect if no auth in this time