1 files changed, 2 insertions, 8 deletions

diff --git a/servconf.h b/servconf.h
index 161fa37c4..913a21b39 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.120 2015/07/10 06:21:53 markus Exp $ */
+/* $OpenBSD: servconf.h,v 1.123 2016/11/30 03:00:05 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -69,10 +69,8 @@ typedef struct {
         int     num_host_cert_files;     /* Number of files for host certs. */
         char   *host_key_agent;          /* ssh-agent socket for host keys. */
         char   *pid_file;       /* Where to put our pid */
-        int     server_key_bits;/* Size of the server key. */
         int     login_grace_time;       /* Disconnect if no auth in this time
                                          * (sec). */
-        int     key_regeneration_time;  /* Server key lifetime (seconds). */
         int     permit_root_login;      /* PERMIT_*, see above */
         int     ignore_rhosts;  /* Ignore .rhosts and .shosts. */
         int     ignore_user_known_hosts;        /* Ignore ~/.ssh/known_hosts
@@ -93,17 +91,13 @@ typedef struct {
         char   *ciphers;        /* Supported SSH2 ciphers. */
         char   *macs;           /* Supported SSH2 macs. */
         char   *kex_algorithms; /* SSH2 kex methods in order of preference. */
-        int     protocol;       /* Supported protocol versions. */
         struct ForwardOptions fwd_opts; /* forwarding options */
         SyslogFacility log_facility;    /* Facility for system logging. */
         LogLevel log_level;     /* Level for system logging. */
-        int     rhosts_rsa_authentication;      /* If true, permit rhosts RSA
-                                                 * authentication. */
         int     hostbased_authentication;       /* If true, permit ssh2 hostbased auth */
         int     hostbased_uses_name_from_packet_only; /* experimental */
         char   *hostbased_key_types;    /* Key types allowed for hostbased */
         char   *hostkeyalgorithms;      /* SSH2 server key types */
-        int     rsa_authentication;     /* If true, permit RSA authentication. */
         int     pubkey_authentication;  /* If true, permit ssh2 pubkey authentication. */
         char   *pubkey_key_types;       /* Key types allowed for public key */
         int     kerberos_authentication;        /* If true, permit Kerberos
@@ -129,11 +123,11 @@ typedef struct {
         int     permit_empty_passwd;    /* If false, do not permit empty
                                          * passwords. */
         int     permit_user_env;        /* If true, read ~/.ssh/environment */
-        int     use_login;      /* If true, login(1) is used */
         int     compression;    /* If true, compression is allowed */
         int     allow_tcp_forwarding; /* One of FORWARD_* */
         int     allow_streamlocal_forwarding; /* One of FORWARD_* */
         int     allow_agent_forwarding;
+        int     disable_forwarding;
         u_int num_allow_users;
         char   *allow_users[MAX_ALLOW_USERS];
         u_int num_deny_users;