[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.101 and 1.102

version 1.101, 2014/02/23 20:11:36 version 1.102, 2014/07/15 15:54:14
Line 16 
Line 16 
 #ifndef READCONF_H  #ifndef READCONF_H
 #define READCONF_H  #define READCONF_H
   
 /* Data structure for representing a forwarding request. */  
   
 typedef struct {  
         char     *listen_host;          /* Host (address) to listen on. */  
         int       listen_port;          /* Port to forward. */  
         char     *connect_host;         /* Host to connect. */  
         int       connect_port;         /* Port to connect on connect_host. */  
         int       allocated_port;       /* Dynamically allocated listen port */  
         int       handle;               /* Handle for dynamic listen ports */  
 }       Forward;  
 /* Data structure for representing option data. */  /* Data structure for representing option data. */
   
 #define MAX_SEND_ENV            256  #define MAX_SEND_ENV            256
 #define SSH_MAX_HOSTS_FILES     32  #define SSH_MAX_HOSTS_FILES     32
 #define MAX_CANON_DOMAINS       32  #define MAX_CANON_DOMAINS       32
   #define PATH_MAX_SUN            (sizeof((struct sockaddr_un *)0)->sun_path)
   
 struct allowed_cname {  struct allowed_cname {
         char *source_list;          char *source_list;
Line 44 
Line 35 
         int     forward_x11_trusted;    /* Trust Forward X11 display. */          int     forward_x11_trusted;    /* Trust Forward X11 display. */
         int     exit_on_forward_failure;        /* Exit if bind(2) fails for -L/-R */          int     exit_on_forward_failure;        /* Exit if bind(2) fails for -L/-R */
         char   *xauth_location; /* Location for xauth program */          char   *xauth_location; /* Location for xauth program */
         int     gateway_ports;  /* Allow remote connects to forwarded ports. */          struct ForwardOptions fwd_opts; /* forwarding options */
         int     use_privileged_port;    /* Don't use privileged port if false. */          int     use_privileged_port;    /* Don't use privileged port if false. */
         int     rhosts_rsa_authentication;      /* Try rhosts with RSA          int     rhosts_rsa_authentication;      /* Try rhosts with RSA
                                                  * authentication. */                                                   * authentication. */
Line 106 
Line 97 
   
         /* Local TCP/IP forward requests. */          /* Local TCP/IP forward requests. */
         int     num_local_forwards;          int     num_local_forwards;
         Forward *local_forwards;          struct Forward *local_forwards;
   
         /* Remote TCP/IP forward requests. */          /* Remote TCP/IP forward requests. */
         int     num_remote_forwards;          int     num_remote_forwards;
         Forward *remote_forwards;          struct Forward *remote_forwards;
         int     clear_forwardings;          int     clear_forwardings;
   
         int     enable_ssh_keysign;          int     enable_ssh_keysign;
Line 181 
Line 172 
     const char *, int, int *, int);      const char *, int, int *, int);
 int      read_config_file(const char *, struct passwd *, const char *,  int      read_config_file(const char *, struct passwd *, const char *,
     Options *, int);      Options *, int);
 int      parse_forward(Forward *, const char *, int, int);  int      parse_forward(struct Forward *, const char *, int, int);
 int      default_ssh_port(void);  int      default_ssh_port(void);
 int      option_clear_or_none(const char *);  int      option_clear_or_none(const char *);
   
 void     add_local_forward(Options *, const Forward *);  void     add_local_forward(Options *, const struct Forward *);
 void     add_remote_forward(Options *, const Forward *);  void     add_remote_forward(Options *, const struct Forward *);
 void     add_identity_file(Options *, const char *, const char *, int);  void     add_identity_file(Options *, const char *, const char *, int);
   
 #endif                          /* READCONF_H */  #endif                          /* READCONF_H */
Legend:
Removed from v.1.101  
changed lines
  Added in v.1.102