- (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 9e943f905c520028276cc0236f9f7bab0f3cb1f5..c884de68b76facd334f3505a3e0f4c64c5209d16 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: readconf.h,v 1.50 2003/05/15 14:55:25 djm 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.30 2001/04/17 10:53:25 markus Exp $"); */
-
 #ifndef READCONF_H
 #define READCONF_H
 
@@ -39,22 +39,15 @@ typedef struct {
        int     rsa_authentication;     /* Try RSA authentication. */
        int     pubkey_authentication;  /* Try ssh2 pubkey authentication. */
        int     hostbased_authentication;       /* ssh2's rhosts_rsa */
-       int     challenge_reponse_authentication;
+       int     challenge_response_authentication;
                                        /* Try S/Key or TIS, authentication. */
-#ifdef KRB4
-       int     kerberos_authentication;        /* Try Kerberos
-                                                * authentication. */
-#endif
-#ifdef AFS
-       int     kerberos_tgt_passing;   /* Try Kerberos tgt passing. */
+       int     kerberos_authentication;        /* Try Kerberos authentication. */
+       int     kerberos_tgt_passing;   /* Try Kerberos TGT passing. */
        int     afs_token_passing;      /* Try AFS token passing. */
-#endif
        int     password_authentication;        /* Try password
                                                 * 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. */
@@ -67,6 +60,8 @@ typedef struct {
        int     port;           /* Port to connect. */
        int     connection_attempts;    /* Max attempts (seconds) before
                                         * giving up */
+       int     connection_timeout;     /* Max time (seconds) before
+                                        * aborting connection attempt */
        int     number_of_password_prompts;     /* Max number of password
                                                 * prompts. */
        int     cipher;         /* Cipher to use. */
@@ -80,11 +75,14 @@ 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;
        char   *preferred_authentications;
+       char   *bind_address;   /* local socket address for connection to sshd */
+       char   *smartcard_device; /* Smartcard reader device */
+       int     verify_host_key_dns;    /* Verify host key using DNS */
 
        int     num_identity_files;     /* Number of files for RSA/DSA identities. */
        char   *identity_files[SSH_MAX_IDENTITY_FILES];
@@ -97,56 +95,22 @@ typedef struct {
        /* Remote TCP/IP forward requests. */
        int     num_remote_forwards;
        Forward remote_forwards[SSH_MAX_FORWARDS_PER_DIRECTION];
-}       Options;
+       int     clear_forwardings;
 
+       int     enable_ssh_keysign;
+       int     rekey_limit;
+       int     no_host_authentication_for_localhost;
+}       Options;
 
-/*
- * Initializes options to special values that indicate that they have not yet
- * been set.  Read_config_file will only set options with this value. Options
- * are processed in the following order: command line, user config file,
- * system config file.  Last, fill_default_options is called.
- */
-void    initialize_options(Options * options);
 
-/*
- * Called after processing other sources of option data, this fills those
- * options for which no value has been specified with their default values.
- */
-void    fill_default_options(Options * options);
+void     initialize_options(Options *);
+void     fill_default_options(Options *);
+int     read_config_file(const char *, const char *, Options *);
 
-/*
- * Processes a single option line as used in the configuration files. This
- * only sets those values that have not already been set. Returns 0 for legal
- * options
- */
 int
-process_config_line(Options * options, const char *host,
-    char *line, const char *filename, int linenum,
-    int *activep);
+process_config_line(Options *, const char *, char *, const char *, int, int *);
 
-/*
- * Reads the config file and modifies the options accordingly.  Options
- * should already be initialized before this call.  This never returns if
- * there is an error.  If the file does not exist, this returns immediately.
- */
-void
-read_config_file(const char *filename, const char *host,
-    Options * options);
-
-/*
- * Adds a local TCP/IP port forward to options.  Never returns if there is an
- * error.
- */
-void
-add_local_forward(Options * options, u_short port, const char *host,
-    u_short host_port);
-
-/*
- * Adds a remote TCP/IP port forward to options.  Never returns if there is
- * an error.
- */
-void
-add_remote_forward(Options * options, u_short port, const char *host,
-    u_short host_port);
+void    add_local_forward(Options *, u_short, const char *, u_short);
+void    add_remote_forward(Options *, u_short, const char *, u_short);
 
 #endif                         /* READCONF_H */