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

Diff for /src/usr.bin/ssh/servconf.c between version 1.251 and 1.252

version 1.251, 2014/07/15 15:54:14 version 1.252, 2014/08/19 23:58:28
Line 50 
Line 50 
 #include "packet.h"  #include "packet.h"
 #include "hostfile.h"  #include "hostfile.h"
 #include "auth.h"  #include "auth.h"
   #include "myproposal.h"
   
 static void add_listen_addr(ServerOptions *, char *, int);  static void add_listen_addr(ServerOptions *, char *, int);
 static void add_one_listen_addr(ServerOptions *, char *, int);  static void add_one_listen_addr(ServerOptions *, char *, int);
Line 2018 
Line 2019 
         /* string arguments */          /* string arguments */
         dump_cfg_string(sPidFile, o->pid_file);          dump_cfg_string(sPidFile, o->pid_file);
         dump_cfg_string(sXAuthLocation, o->xauth_location);          dump_cfg_string(sXAuthLocation, o->xauth_location);
         dump_cfg_string(sCiphers, o->ciphers ? o->ciphers :          dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : KEX_SERVER_ENCRYPT);
             cipher_alg_list(',', 0));          dump_cfg_string(sMacs, o->macs ? o->macs : KEX_SERVER_MAC);
         dump_cfg_string(sMacs, o->macs ? o->macs : mac_alg_list(','));  
         dump_cfg_string(sBanner, o->banner);          dump_cfg_string(sBanner, o->banner);
         dump_cfg_string(sForceCommand, o->adm_forced_command);          dump_cfg_string(sForceCommand, o->adm_forced_command);
         dump_cfg_string(sChrootDirectory, o->chroot_directory);          dump_cfg_string(sChrootDirectory, o->chroot_directory);
Line 2032 
Line 2032 
         dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);          dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
         dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);          dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
         dump_cfg_string(sHostKeyAgent, o->host_key_agent);          dump_cfg_string(sHostKeyAgent, o->host_key_agent);
         dump_cfg_string(sKexAlgorithms, o->kex_algorithms ? o->kex_algorithms :          dump_cfg_string(sKexAlgorithms,
             kex_alg_list(','));              o->kex_algorithms ? o->kex_algorithms : KEX_SERVER_KEX);
   
         /* string arguments requiring a lookup */          /* string arguments requiring a lookup */
         dump_cfg_string(sLogLevel, log_level_name(o->log_level));          dump_cfg_string(sLogLevel, log_level_name(o->log_level));

Legend:
Removed from v.1.251  
changed lines
  Added in v.1.252