[BACK]Return to readconf.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / crypto / external / bsd / openssh / dist

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/crypto/external/bsd/openssh/dist/readconf.h between version 1.6.2.2 and 1.7

version 1.6.2.2, 2014/05/22 13:21:35 version 1.7, 2012/04/27 15:45:37
Line 1 
Line 1 
 /*      $NetBSD$        */  /*      $NetBSD$        */
 /* $OpenBSD: readconf.h,v 1.95 2013/05/16 04:27:50 djm Exp $ */  /* $OpenBSD: readconf.h,v 1.90 2011/05/24 07:15:47 djm Exp $ */
   
 /*  /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
Line 25  typedef struct {
Line 25  typedef struct {
         char     *connect_host;         /* Host to connect. */          char     *connect_host;         /* Host to connect. */
         int       connect_port;         /* Port to connect on connect_host. */          int       connect_port;         /* Port to connect on connect_host. */
         int       allocated_port;       /* Dynamically allocated listen port */          int       allocated_port;       /* Dynamically allocated listen port */
         int       handle;               /* Handle for dynamic listen ports */  
 }       Forward;  }       Forward;
 /* Data structure for representing option data. */  /* Data structure for representing option data. */
   
Line 111  typedef struct {
Line 110  typedef struct {
   
         int     num_identity_files;     /* Number of files for RSA/DSA identities. */          int     num_identity_files;     /* Number of files for RSA/DSA identities. */
         char   *identity_files[SSH_MAX_IDENTITY_FILES];          char   *identity_files[SSH_MAX_IDENTITY_FILES];
         int    identity_file_userprovided[SSH_MAX_IDENTITY_FILES];  
         Key    *identity_keys[SSH_MAX_IDENTITY_FILES];          Key    *identity_keys[SSH_MAX_IDENTITY_FILES];
   
         /* Local TCP/IP forward requests. */          /* Local TCP/IP forward requests. */
Line 125  typedef struct {
Line 123  typedef struct {
   
         int     enable_ssh_keysign;          int     enable_ssh_keysign;
         int64_t rekey_limit;          int64_t rekey_limit;
         int     rekey_interval;  
         int     none_switch;    /* Use none cipher */          int     none_switch;    /* Use none cipher */
         int     none_enabled;   /* Allow none to be used */          int     none_enabled;   /* Allow none to be used */
         int     no_host_authentication_for_localhost;          int     no_host_authentication_for_localhost;
Line 155  typedef struct {
Line 152  typedef struct {
   
         int     request_tty;          int     request_tty;
         int     send_version_first;          int     send_version_first;
   
         char    *ignored_unknown; /* Pattern list of unknown tokens to ignore */  
 }       Options;  }       Options;
   
 #define SSHCTL_MASTER_NO        0  #define SSHCTL_MASTER_NO        0
Line 170  typedef struct {
Line 165  typedef struct {
 #define REQUEST_TTY_YES         2  #define REQUEST_TTY_YES         2
 #define REQUEST_TTY_FORCE       3  #define REQUEST_TTY_FORCE       3
   
 #define SSHCONF_CHECKPERM       1  /* check permissions on config file */  
 #define SSHCONF_USERCONF        2  /* user provided config file not system */  
   
 void     initialize_options(Options *);  void     initialize_options(Options *);
 void     fill_default_options(Options *);  void     fill_default_options(Options *);
 int      read_config_file(const char *, const char *, Options *, int);  int      read_config_file(const char *, const char *, Options *, int);
 int      parse_forward(Forward *, const char *, int, int);  int      parse_forward(Forward *, const char *, int, int);
   
 int  int
 process_config_line(Options *, const char *, char *, const char *, int, int *,  process_config_line(Options *, const char *, char *, const char *, int, int *);
     int);  
   
 void     add_local_forward(Options *, const Forward *);  void     add_local_forward(Options *, const Forward *);
 void     add_remote_forward(Options *, const Forward *);  void     add_remote_forward(Options *, const Forward *);
 void     add_identity_file(Options *, const char *, const char *, int);  
   
 #endif                          /* READCONF_H */  #endif                          /* READCONF_H */
Legend:
Removed from v.1.6.2.2  
changed lines
  Added in v.1.7
CVSweb <webmaster@jp.NetBSD.org>