- (bal) auth1.c minor resync while looking at the code.

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 25ffa4668b4f482ff70389e88640a98e84709e42..d35472117f622952e0cfa407c9abd7e9c2fa61f3 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: readconf.h,v 1.47 2003/04/02 09:48:07 markus Exp $    */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: readconf.h,v 1.40 2001/10/01 21:51:16 markus Exp $"); */
-
 #ifndef READCONF_H
 #define READCONF_H
 
@@ -54,8 +54,6 @@ typedef struct {
                                                 * authentication. */
        int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
        char    *kbd_interactive_devices; /* Keyboard-interactive auth devices. */
-       int     fallback_to_rsh;/* Use rsh if cannot connect with ssh. */
-       int     use_rsh;        /* Always use rsh (don\'t try ssh). */
        int     batch_mode;     /* Batch mode: do not ask for passwords. */
        int     check_host_ip;  /* Also keep track of keys for IP address */
        int     strict_host_key_checking;       /* Strict host key checking. */
@@ -81,7 +79,7 @@ typedef struct {
        char   *user;           /* User to log in as. */
        int     escape_char;    /* Escape character; -2 = none */
 
-       char   *system_hostfile;/* Path for /etc/ssh_known_hosts. */
+       char   *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */
        char   *user_hostfile;  /* Path for $HOME/.ssh/known_hosts. */
        char   *system_hostfile2;
        char   *user_hostfile2;
@@ -101,6 +99,9 @@ typedef struct {
        int     num_remote_forwards;
        Forward remote_forwards[SSH_MAX_FORWARDS_PER_DIRECTION];
        int     clear_forwardings;
+
+       int     enable_ssh_keysign;
+       int     rekey_limit;
        int     no_host_authentication_for_localhost;
 }       Options;