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

Diff for /src/usr.bin/ssh/readconf.c between version 1.284 and 1.285

version 1.284, 2018/04/04 15:12:17 version 1.285, 2018/04/06 03:51:27
Line 2331 
Line 2331 
                 return fmt_multistate_int(val, multistate_requesttty);                  return fmt_multistate_int(val, multistate_requesttty);
         case oCanonicalizeHostname:          case oCanonicalizeHostname:
                 return fmt_multistate_int(val, multistate_canonicalizehostname);                  return fmt_multistate_int(val, multistate_canonicalizehostname);
           case oAddKeysToAgent:
                   return fmt_multistate_int(val, multistate_yesnoaskconfirm);
         case oFingerprintHash:          case oFingerprintHash:
                 return ssh_digest_alg_name(val);                  return ssh_digest_alg_name(val);
         default:          default:
Line 2450 
Line 2452 
         dump_cfg_int(oPort, o->port);          dump_cfg_int(oPort, o->port);
   
         /* Flag options */          /* Flag options */
           dump_cfg_fmtint(oAddKeysToAgent, o->add_keys_to_agent);
         dump_cfg_fmtint(oAddressFamily, o->address_family);          dump_cfg_fmtint(oAddressFamily, o->address_family);
         dump_cfg_fmtint(oBatchMode, o->batch_mode);          dump_cfg_fmtint(oBatchMode, o->batch_mode);
         dump_cfg_fmtint(oCanonicalizeFallbackLocal, o->canonicalize_fallback_local);          dump_cfg_fmtint(oCanonicalizeFallbackLocal, o->canonicalize_fallback_local);
Line 2506 
Line 2509 
         dump_cfg_string(oHostKeyAlias, o->host_key_alias);          dump_cfg_string(oHostKeyAlias, o->host_key_alias);
         dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types);          dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types);
         dump_cfg_string(oIdentityAgent, o->identity_agent);          dump_cfg_string(oIdentityAgent, o->identity_agent);
           dump_cfg_string(oIgnoreUnknown, o->ignored_unknown);
         dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);          dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);
         dump_cfg_string(oKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : KEX_CLIENT_KEX);          dump_cfg_string(oKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : KEX_CLIENT_KEX);
         dump_cfg_string(oLocalCommand, o->local_command);          dump_cfg_string(oLocalCommand, o->local_command);
Line 2528 
Line 2532 
         /* String array options */          /* String array options */
         dump_cfg_strarray(oIdentityFile, o->num_identity_files, o->identity_files);          dump_cfg_strarray(oIdentityFile, o->num_identity_files, o->identity_files);
         dump_cfg_strarray_oneline(oCanonicalDomains, o->num_canonical_domains, o->canonical_domains);          dump_cfg_strarray_oneline(oCanonicalDomains, o->num_canonical_domains, o->canonical_domains);
           dump_cfg_strarray(oCertificateFile, o->num_certificate_files, o->certificate_files);
         dump_cfg_strarray_oneline(oGlobalKnownHostsFile, o->num_system_hostfiles, o->system_hostfiles);          dump_cfg_strarray_oneline(oGlobalKnownHostsFile, o->num_system_hostfiles, o->system_hostfiles);
         dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles);          dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles);
         dump_cfg_strarray(oSendEnv, o->num_send_env, o->send_env);          dump_cfg_strarray(oSendEnv, o->num_send_env, o->send_env);
Line 2587 
Line 2592 
         /* oStreamLocalBindMask */          /* oStreamLocalBindMask */
         printf("streamlocalbindmask 0%o\n",          printf("streamlocalbindmask 0%o\n",
             o->fwd_opts.streamlocal_bind_mask);              o->fwd_opts.streamlocal_bind_mask);
   
           /* oLogFacility */
           printf("syslogfacility %s\n", log_facility_name(o->log_facility));
   
         /* oProxyCommand / oProxyJump */          /* oProxyCommand / oProxyJump */
         if (o->jump_host == NULL)          if (o->jump_host == NULL)
Legend:
Removed from v.1.284  
changed lines
  Added in v.1.285