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

Diff for /src/usr.bin/ssh/servconf.h between version 1.120 and 1.121

version 1.120, 2015/07/10 06:21:53 version 1.121, 2016/08/15 12:27:56
Line 69 
Line 69 
         int     num_host_cert_files;     /* Number of files for host certs. */          int     num_host_cert_files;     /* Number of files for host certs. */
         char   *host_key_agent;          /* ssh-agent socket for host keys. */          char   *host_key_agent;          /* ssh-agent socket for host keys. */
         char   *pid_file;       /* Where to put our pid */          char   *pid_file;       /* Where to put our pid */
         int     server_key_bits;/* Size of the server key. */  
         int     login_grace_time;       /* Disconnect if no auth in this time          int     login_grace_time;       /* Disconnect if no auth in this time
                                          * (sec). */                                           * (sec). */
         int     key_regeneration_time;  /* Server key lifetime (seconds). */  
         int     permit_root_login;      /* PERMIT_*, see above */          int     permit_root_login;      /* PERMIT_*, see above */
         int     ignore_rhosts;  /* Ignore .rhosts and .shosts. */          int     ignore_rhosts;  /* Ignore .rhosts and .shosts. */
         int     ignore_user_known_hosts;        /* Ignore ~/.ssh/known_hosts          int     ignore_user_known_hosts;        /* Ignore ~/.ssh/known_hosts
Line 93 
Line 91 
         char   *ciphers;        /* Supported SSH2 ciphers. */          char   *ciphers;        /* Supported SSH2 ciphers. */
         char   *macs;           /* Supported SSH2 macs. */          char   *macs;           /* Supported SSH2 macs. */
         char   *kex_algorithms; /* SSH2 kex methods in order of preference. */          char   *kex_algorithms; /* SSH2 kex methods in order of preference. */
         int     protocol;       /* Supported protocol versions. */  
         struct ForwardOptions fwd_opts; /* forwarding options */          struct ForwardOptions fwd_opts; /* forwarding options */
         SyslogFacility log_facility;    /* Facility for system logging. */          SyslogFacility log_facility;    /* Facility for system logging. */
         LogLevel log_level;     /* Level for system logging. */          LogLevel log_level;     /* Level for system logging. */
         int     rhosts_rsa_authentication;      /* If true, permit rhosts RSA  
                                                  * authentication. */  
         int     hostbased_authentication;       /* If true, permit ssh2 hostbased auth */          int     hostbased_authentication;       /* If true, permit ssh2 hostbased auth */
         int     hostbased_uses_name_from_packet_only; /* experimental */          int     hostbased_uses_name_from_packet_only; /* experimental */
         char   *hostbased_key_types;    /* Key types allowed for hostbased */          char   *hostbased_key_types;    /* Key types allowed for hostbased */
         char   *hostkeyalgorithms;      /* SSH2 server key types */          char   *hostkeyalgorithms;      /* SSH2 server key types */
         int     rsa_authentication;     /* If true, permit RSA authentication. */  
         int     pubkey_authentication;  /* If true, permit ssh2 pubkey authentication. */          int     pubkey_authentication;  /* If true, permit ssh2 pubkey authentication. */
         char   *pubkey_key_types;       /* Key types allowed for public key */          char   *pubkey_key_types;       /* Key types allowed for public key */
         int     kerberos_authentication;        /* If true, permit Kerberos          int     kerberos_authentication;        /* If true, permit Kerberos

Legend:
Removed from v.1.120  
changed lines
  Added in v.1.121