summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/servconf.h b/servconf.h
index bad73a510..8a9fae9cf 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.85 2008/06/10 04:50:25 dtucker Exp $ */ 1/* $OpenBSD: servconf.h,v 1.87 2009/01/22 10:02:34 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -41,9 +41,9 @@
41#define INTERNAL_SFTP_NAME "internal-sftp" 41#define INTERNAL_SFTP_NAME "internal-sftp"
42 42
43typedef struct { 43typedef struct {
44 u_int num_ports; 44 u_int num_ports;
45 u_int ports_from_cmdline; 45 u_int ports_from_cmdline;
46 u_short ports[MAX_PORTS]; /* Port number to listen on. */ 46 int ports[MAX_PORTS]; /* Port number to listen on. */
47 char *listen_addr; /* Address on which the server listens. */ 47 char *listen_addr; /* Address on which the server listens. */
48 struct addrinfo *listen_addrs; /* Addresses on which the server listens. */ 48 struct addrinfo *listen_addrs; /* Addresses on which the server listens. */
49 int address_family; /* Address family used by the server. */ 49 int address_family; /* Address family used by the server. */
@@ -91,13 +91,16 @@ typedef struct {
91 int kerberos_get_afs_token; /* If true, try to get AFS token if 91 int kerberos_get_afs_token; /* If true, try to get AFS token if
92 * authenticated with Kerberos. */ 92 * authenticated with Kerberos. */
93 int gss_authentication; /* If true, permit GSSAPI authentication */ 93 int gss_authentication; /* If true, permit GSSAPI authentication */
94 int gss_keyex; /* If true, permit GSSAPI key exchange */ 94 int gss_keyex; /* If true, permit GSSAPI key exchange */
95 int gss_cleanup_creds; /* If true, destroy cred cache on logout */ 95 int gss_cleanup_creds; /* If true, destroy cred cache on logout */
96 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ 96 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
97 int gss_store_rekey;
97 int password_authentication; /* If true, permit password 98 int password_authentication; /* If true, permit password
98 * authentication. */ 99 * authentication. */
99 int kbd_interactive_authentication; /* If true, permit */ 100 int kbd_interactive_authentication; /* If true, permit */
100 int challenge_response_authentication; 101 int challenge_response_authentication;
102 int zero_knowledge_password_authentication;
103 /* If true, permit jpake auth */
101 int permit_empty_passwd; /* If false, do not permit empty 104 int permit_empty_passwd; /* If false, do not permit empty
102 * passwords. */ 105 * passwords. */
103 int permit_user_env; /* If true, read ~/.ssh/environment */ 106 int permit_user_env; /* If true, read ~/.ssh/environment */