- jakob@cvs.openbsd.org 2001/07/31 09:28:44

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 680068b0934379f681ce46a74c7d05ed32fe42ac..623a448108b2ae64015cf288a0228f170adc0b2e 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: readconf.h,v 1.29 2001/04/12 19:15:25 markus Exp $"); */
+/* RCSID("$OpenBSD: readconf.h,v 1.36 2001/07/31 09:28:44 jakob Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
@@ -39,14 +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. */
+#if defined(KRB4) || defined(KRB5)
+       int     kerberos_authentication;        /* Try Kerberos authentication. */
+#endif
+#if defined(AFS) || defined(KRB5)
+       int     kerberos_tgt_passing;   /* Try Kerberos TGT passing. */
 #endif
 #ifdef AFS
-       int     kerberos_tgt_passing;   /* Try Kerberos tgt passing. */
        int     afs_token_passing;      /* Try AFS token passing. */
 #endif
        int     password_authentication;        /* Try password
@@ -72,6 +73,7 @@ typedef struct {
        int     cipher;         /* Cipher to use. */
        char   *ciphers;        /* SSH2 ciphers in order of preference. */
        char   *macs;           /* SSH2 macs in order of preference. */
+       char   *hostkeyalgorithms;      /* SSH2 server key types in order of preference. */
        int     protocol;       /* Protocol in order of preference. */
        char   *hostname;       /* Real host to connect. */
        char   *host_key_alias; /* hostname alias for .ssh/known_hosts */
@@ -84,6 +86,8 @@ typedef struct {
        char   *system_hostfile2;
        char   *user_hostfile2;
        char   *preferred_authentications;
+       char   *bind_address;   /* local socket address for connection to sshd */
+       int     smartcard_device; /* Smartcard reader device */
 
        int     num_identity_files;     /* Number of files for RSA/DSA identities. */
        char   *identity_files[SSH_MAX_IDENTITY_FILES];
@@ -99,53 +103,14 @@ typedef struct {
 }       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);
+void     initialize_options(Options *);
+void     fill_default_options(Options *);
+void    read_config_file(const char *, const char *, 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);
-
-/*
- * 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 */