- itojun@cvs.openbsd.org 2002/05/13 02:37:39

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 2f784e6e2d117965bbddc0a4973e950acf68ad0c..4fa9040c976bf06bdbccf6881d6c67e703d1e3ae 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: readconf.h,v 1.42 2002/03/04 17:27:39 stevesk 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.34 2001/06/26 16:15:24 dugsong Exp $"); */
-
 #ifndef READCONF_H
 #define READCONF_H
 
@@ -81,12 +81,13 @@ 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     num_identity_files;     /* Number of files for RSA/DSA identities. */
        char   *identity_files[SSH_MAX_IDENTITY_FILES];
@@ -99,51 +100,19 @@ typedef struct {
        /* Remote TCP/IP forward requests. */
        int     num_remote_forwards;
        Forward remote_forwards[SSH_MAX_FORWARDS_PER_DIRECTION];
+       int     clear_forwardings;
+       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 *);
+void     initialize_options(Options *);
+void     fill_default_options(Options *);
+int     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 *);
-
-/*
- * 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 *, 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 *, const char *, Options *);
-
-/*
- * Adds a local TCP/IP port forward to options.  Never returns if there is an
- * error.
- */
-void
-add_local_forward(Options *, u_short, const char *, u_short);
-
-/*
- * Adds a remote TCP/IP port forward to options.  Never returns if there is
- * an error.
- */
-void
-add_remote_forward(Options *, u_short, const char *, u_short);
+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 */