diff options
author | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
commit | 6534271ec8abc00a8016a575a8e7151d944ef5a8 (patch) | |
tree | a7d90beaf7fa4922f64c5a6eca7154fa082e43a1 /crypto/openssh/readconf.h | |
parent | d3e3318ac7d7a176fefa5849509c01442694b4c7 (diff) | |
download | FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.zip FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.tar.gz |
Fix conflicts.
Diffstat (limited to 'crypto/openssh/readconf.h')
-rw-r--r-- | crypto/openssh/readconf.h | 77 |
1 files changed, 19 insertions, 58 deletions
diff --git a/crypto/openssh/readconf.h b/crypto/openssh/readconf.h index f429f76..c310137 100644 --- a/crypto/openssh/readconf.h +++ b/crypto/openssh/readconf.h @@ -1,3 +1,6 @@ +/* $OpenBSD: readconf.h,v 1.42 2002/03/04 17:27:39 stevesk Exp $ */ +/* $FreeBSD$ */ + /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -11,9 +14,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 $"); */ -/* RCSID("$FreeBSD$"); */ - #ifndef READCONF_H #define READCONF_H @@ -40,19 +40,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. */ #if defined(KRB4) || defined(KRB5) - int kerberos_authentication; /* Try Kerberos - * authentication. */ + int kerberos_authentication; /* Try Kerberos authentication. */ +#endif +#if defined(AFS) || defined(KRB5) + int kerberos_tgt_passing; /* Try Kerberos TGT passing. */ #endif - -#ifdef KRB5 - int krb5_tgt_passing; -#endif /* KRB5 */ - #ifdef AFS - int krb4_tgt_passing; /* Try Kerberos v4 tgt passing. */ int afs_token_passing; /* Try AFS token passing. */ #endif int password_authentication; /* Try password @@ -86,11 +82,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]; @@ -103,56 +101,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 * 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); - -/* - * 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); +process_config_line(Options *, const char *, char *, const char *, int, int *); -/* - * 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 */ |