[BACK]Return to readconf.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/readconf.h between version 1.18 and 1.18.2.5

version 1.18, 2000/05/08 17:12:15 version 1.18.2.5, 2001/03/21 18:52:57
Line 1 
Line 1 
 /*  /*
  *  
  * readconf.h  
  *  
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  *  
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved   *                    All rights reserved
  *  
  * Created: Sat Apr 22 00:25:29 1995 ylo  
  *  
  * Functions for reading the configuration file.   * Functions for reading the configuration file.
  *   *
    * As far as I am concerned, the code I have written for this software
    * can be used freely for any purpose.  Any derived versions of this
    * software must be clearly marked as such, and if the derived work is
    * incompatible with the protocol description in the RFC file, it must be
    * called by a name other than "ssh" or "Secure Shell".
  */   */
   
 /* RCSID("$Id$"); */  /* RCSID("$OpenBSD$"); */
   
 #ifndef READCONF_H  #ifndef READCONF_H
 #define READCONF_H  #define READCONF_H
   
   #include "key.h"
   
 /* Data structure for representing a forwarding request. */  /* Data structure for representing a forwarding request. */
   
 typedef struct {  typedef struct {
Line 30 
Line 30 
 typedef struct {  typedef struct {
         int     forward_agent;  /* Forward authentication agent. */          int     forward_agent;  /* Forward authentication agent. */
         int     forward_x11;    /* Forward X11 display. */          int     forward_x11;    /* Forward X11 display. */
           char   *xauth_location; /* Location for xauth program */
         int     gateway_ports;  /* Allow remote connects to forwarded ports. */          int     gateway_ports;  /* Allow remote connects to forwarded ports. */
         int     use_privileged_port;    /* Don't use privileged port if false. */          int     use_privileged_port;    /* Don't use privileged port if false. */
         int     rhosts_authentication;  /* Try rhosts authentication. */          int     rhosts_authentication;  /* Try rhosts authentication. */
         int     rhosts_rsa_authentication;      /* Try rhosts with RSA          int     rhosts_rsa_authentication;      /* Try rhosts with RSA
                                                  * authentication. */                                                   * authentication. */
         int     rsa_authentication;     /* Try RSA authentication. */          int     rsa_authentication;     /* Try RSA authentication. */
         int     dsa_authentication;     /* Try DSA authentication. */          int     pubkey_authentication;  /* Try ssh2 pubkey authentication. */
         int     skey_authentication;    /* Try S/Key or TIS authentication. */          int     challenge_reponse_authentication;
                                           /* Try S/Key or TIS, authentication. */
 #ifdef KRB4  #ifdef KRB4
         int     kerberos_authentication;        /* Try Kerberos          int     kerberos_authentication;        /* Try Kerberos
                                                  * authentication. */                                                   * authentication. */
Line 48 
Line 50 
 #endif  #endif
         int     password_authentication;        /* Try password          int     password_authentication;        /* Try password
                                                  * authentication. */                                                   * 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     fallback_to_rsh;/* Use rsh if cannot connect with ssh. */
         int     use_rsh;        /* Always use rsh (don\'t try ssh). */          int     use_rsh;        /* Always use rsh (don\'t try ssh). */
         int     batch_mode;     /* Batch mode: do not ask for passwords. */          int     batch_mode;     /* Batch mode: do not ask for passwords. */
Line 66 
Line 70 
                                                  * prompts. */                                                   * prompts. */
         int     cipher;         /* Cipher to use. */          int     cipher;         /* Cipher to use. */
         char   *ciphers;        /* SSH2 ciphers in order of preference. */          char   *ciphers;        /* SSH2 ciphers in order of preference. */
           char   *macs;           /* SSH2 macs in order of preference. */
         int     protocol;       /* Protocol in order of preference. */          int     protocol;       /* Protocol in order of preference. */
         char   *hostname;       /* Real host to connect. */          char   *hostname;       /* Real host to connect. */
           char   *host_key_alias; /* hostname alias for .ssh/known_hosts */
         char   *proxy_command;  /* Proxy command for connecting the host. */          char   *proxy_command;  /* Proxy command for connecting the host. */
         char   *user;           /* User to log in as. */          char   *user;           /* User to log in as. */
         int     escape_char;    /* Escape character; -2 = none */          int     escape_char;    /* Escape character; -2 = none */
Line 76 
Line 82 
         char   *user_hostfile;  /* Path for $HOME/.ssh/known_hosts. */          char   *user_hostfile;  /* Path for $HOME/.ssh/known_hosts. */
         char   *system_hostfile2;          char   *system_hostfile2;
         char   *user_hostfile2;          char   *user_hostfile2;
           char   *preferred_authentications;
   
         int     num_identity_files;     /* Number of files for RSA identities. */          int     num_identity_files;     /* Number of files for RSA/DSA identities. */
         int     num_identity_files2;    /* DSA identities. */  
         char   *identity_files[SSH_MAX_IDENTITY_FILES];          char   *identity_files[SSH_MAX_IDENTITY_FILES];
         char   *identity_files2[SSH_MAX_IDENTITY_FILES];          Key    *identity_keys[SSH_MAX_IDENTITY_FILES];
   
         /* Local TCP/IP forward requests. */          /* Local TCP/IP forward requests. */
         int     num_local_forwards;          int     num_local_forwards;
Legend:
Removed from v.1.18  
changed lines
  Added in v.1.18.2.5