[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.265 and 1.266

version 1.265, 2017/01/30 00:34:01 version 1.266, 2017/01/30 00:38:50
Line 78 
Line 78 
   
    Host books.com     Host books.com
      RemoteForward 9999 shadows.cs.hut.fi:9999       RemoteForward 9999 shadows.cs.hut.fi:9999
      Cipher 3des       Ciphers 3des-cbc
   
    Host fascist.blob.com     Host fascist.blob.com
      Port 23123       Port 23123
Line 93 
Line 93 
      PublicKeyAuthentication no       PublicKeyAuthentication no
   
    Host *.su     Host *.su
      Cipher none       Ciphers aes128-ctr
      PasswordAuthentication no       PasswordAuthentication no
   
    Host vpn.fake.com     Host vpn.fake.com
Line 165 
Line 165 
         const char *name;          const char *name;
         OpCodes opcode;          OpCodes opcode;
 } keywords[] = {  } keywords[] = {
           /* Deprecated options */
           { "fallbacktorsh", oDeprecated },
           { "globalknownhostsfile2", oDeprecated },
           { "rhostsauthentication", oDeprecated },
           { "userknownhostsfile2", oDeprecated },
           { "useroaming", oDeprecated },
           { "usersh", oDeprecated },
   
           /* Unsupported options */
           { "afstokenpassing", oUnsupported },
           { "kerberosauthentication", oUnsupported },
           { "kerberostgtpassing", oUnsupported },
   
           /* Sometimes-unsupported options */
   #if defined(GSSAPI)
           { "gssapiauthentication", oGssAuthentication },
           { "gssapidelegatecredentials", oGssDelegateCreds },
   # else
           { "gssapiauthentication", oUnsupported },
           { "gssapidelegatecredentials", oUnsupported },
   #endif
   #ifdef ENABLE_PKCS11
           { "smartcarddevice", oPKCS11Provider },
           { "pkcs11provider", oPKCS11Provider },
   # else
           { "smartcarddevice", oUnsupported },
           { "pkcs11provider", oUnsupported },
   #endif
   #ifdef WITH_SSH1
           { "rsaauthentication", oRSAAuthentication },
           { "rhostsrsaauthentication", oRhostsRSAAuthentication },
           { "compressionlevel", oCompressionLevel },
   # else
           { "rsaauthentication", oUnsupported },
           { "rhostsrsaauthentication", oUnsupported },
           { "compressionlevel", oUnsupported },
   #endif
   
         { "forwardagent", oForwardAgent },          { "forwardagent", oForwardAgent },
         { "forwardx11", oForwardX11 },          { "forwardx11", oForwardX11 },
         { "forwardx11trusted", oForwardX11Trusted },          { "forwardx11trusted", oForwardX11Trusted },
Line 173 
Line 211 
         { "xauthlocation", oXAuthLocation },          { "xauthlocation", oXAuthLocation },
         { "gatewayports", oGatewayPorts },          { "gatewayports", oGatewayPorts },
         { "useprivilegedport", oUsePrivilegedPort },          { "useprivilegedport", oUsePrivilegedPort },
         { "rhostsauthentication", oDeprecated },  
         { "passwordauthentication", oPasswordAuthentication },          { "passwordauthentication", oPasswordAuthentication },
         { "kbdinteractiveauthentication", oKbdInteractiveAuthentication },          { "kbdinteractiveauthentication", oKbdInteractiveAuthentication },
         { "kbdinteractivedevices", oKbdInteractiveDevices },          { "kbdinteractivedevices", oKbdInteractiveDevices },
         { "rsaauthentication", oRSAAuthentication },  
         { "pubkeyauthentication", oPubkeyAuthentication },          { "pubkeyauthentication", oPubkeyAuthentication },
         { "dsaauthentication", oPubkeyAuthentication },             /* alias */          { "dsaauthentication", oPubkeyAuthentication },             /* alias */
         { "rhostsrsaauthentication", oRhostsRSAAuthentication },  
         { "hostbasedauthentication", oHostbasedAuthentication },          { "hostbasedauthentication", oHostbasedAuthentication },
         { "challengeresponseauthentication", oChallengeResponseAuthentication },          { "challengeresponseauthentication", oChallengeResponseAuthentication },
         { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */          { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */
         { "tisauthentication", oChallengeResponseAuthentication },  /* alias */          { "tisauthentication", oChallengeResponseAuthentication },  /* alias */
         { "kerberosauthentication", oUnsupported },  
         { "kerberostgtpassing", oUnsupported },  
         { "afstokenpassing", oUnsupported },  
 #if defined(GSSAPI)  
         { "gssapiauthentication", oGssAuthentication },  
         { "gssapidelegatecredentials", oGssDelegateCreds },  
 #else  
         { "gssapiauthentication", oUnsupported },  
         { "gssapidelegatecredentials", oUnsupported },  
 #endif  
         { "fallbacktorsh", oDeprecated },  
         { "usersh", oDeprecated },  
         { "identityfile", oIdentityFile },          { "identityfile", oIdentityFile },
         { "identityfile2", oIdentityFile },                     /* obsolete */          { "identityfile2", oIdentityFile },                     /* obsolete */
         { "identitiesonly", oIdentitiesOnly },          { "identitiesonly", oIdentitiesOnly },
Line 218 
Line 241 
         { "match", oMatch },          { "match", oMatch },
         { "escapechar", oEscapeChar },          { "escapechar", oEscapeChar },
         { "globalknownhostsfile", oGlobalKnownHostsFile },          { "globalknownhostsfile", oGlobalKnownHostsFile },
         { "globalknownhostsfile2", oDeprecated },  
         { "userknownhostsfile", oUserKnownHostsFile },          { "userknownhostsfile", oUserKnownHostsFile },
         { "userknownhostsfile2", oDeprecated },  
         { "connectionattempts", oConnectionAttempts },          { "connectionattempts", oConnectionAttempts },
         { "batchmode", oBatchMode },          { "batchmode", oBatchMode },
         { "checkhostip", oCheckHostIP },          { "checkhostip", oCheckHostIP },
         { "stricthostkeychecking", oStrictHostKeyChecking },          { "stricthostkeychecking", oStrictHostKeyChecking },
         { "compression", oCompression },          { "compression", oCompression },
         { "compressionlevel", oCompressionLevel },  
         { "tcpkeepalive", oTCPKeepAlive },          { "tcpkeepalive", oTCPKeepAlive },
         { "keepalive", oTCPKeepAlive },                         /* obsolete */          { "keepalive", oTCPKeepAlive },                         /* obsolete */
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
Line 235 
Line 255 
         { "preferredauthentications", oPreferredAuthentications },          { "preferredauthentications", oPreferredAuthentications },
         { "hostkeyalgorithms", oHostKeyAlgorithms },          { "hostkeyalgorithms", oHostKeyAlgorithms },
         { "bindaddress", oBindAddress },          { "bindaddress", oBindAddress },
 #ifdef ENABLE_PKCS11  
         { "smartcarddevice", oPKCS11Provider },  
         { "pkcs11provider", oPKCS11Provider },  
 #else  
         { "smartcarddevice", oUnsupported },  
         { "pkcs11provider", oUnsupported },  
 #endif  
         { "clearallforwardings", oClearAllForwardings },          { "clearallforwardings", oClearAllForwardings },
         { "enablesshkeysign", oEnableSSHKeysign },          { "enablesshkeysign", oEnableSSHKeysign },
         { "verifyhostkeydns", oVerifyHostKeyDNS },          { "verifyhostkeydns", oVerifyHostKeyDNS },
Line 262 
Line 275 
         { "localcommand", oLocalCommand },          { "localcommand", oLocalCommand },
         { "permitlocalcommand", oPermitLocalCommand },          { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },          { "visualhostkey", oVisualHostKey },
         { "useroaming", oDeprecated },  
         { "kexalgorithms", oKexAlgorithms },          { "kexalgorithms", oKexAlgorithms },
         { "ipqos", oIPQoS },          { "ipqos", oIPQoS },
         { "requesttty", oRequestTTY },          { "requesttty", oRequestTTY },
Line 2510 
Line 2522 
         dump_cfg_fmtint(oProxyUseFdpass, o->proxy_use_fdpass);          dump_cfg_fmtint(oProxyUseFdpass, o->proxy_use_fdpass);
         dump_cfg_fmtint(oPubkeyAuthentication, o->pubkey_authentication);          dump_cfg_fmtint(oPubkeyAuthentication, o->pubkey_authentication);
         dump_cfg_fmtint(oRequestTTY, o->request_tty);          dump_cfg_fmtint(oRequestTTY, o->request_tty);
   #ifdef WITH_RSA1
         dump_cfg_fmtint(oRhostsRSAAuthentication, o->rhosts_rsa_authentication);          dump_cfg_fmtint(oRhostsRSAAuthentication, o->rhosts_rsa_authentication);
         dump_cfg_fmtint(oRSAAuthentication, o->rsa_authentication);          dump_cfg_fmtint(oRSAAuthentication, o->rsa_authentication);
   #endif
         dump_cfg_fmtint(oStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);          dump_cfg_fmtint(oStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);
         dump_cfg_fmtint(oStrictHostKeyChecking, o->strict_host_key_checking);          dump_cfg_fmtint(oStrictHostKeyChecking, o->strict_host_key_checking);
         dump_cfg_fmtint(oTCPKeepAlive, o->tcp_keep_alive);          dump_cfg_fmtint(oTCPKeepAlive, o->tcp_keep_alive);
Line 2523 
Line 2537 
   
         /* Integer options */          /* Integer options */
         dump_cfg_int(oCanonicalizeMaxDots, o->canonicalize_max_dots);          dump_cfg_int(oCanonicalizeMaxDots, o->canonicalize_max_dots);
   #ifdef WITH_SSH1
         dump_cfg_int(oCompressionLevel, o->compression_level);          dump_cfg_int(oCompressionLevel, o->compression_level);
   #endif
         dump_cfg_int(oConnectionAttempts, o->connection_attempts);          dump_cfg_int(oConnectionAttempts, o->connection_attempts);
         dump_cfg_int(oForwardX11Timeout, o->forward_x11_timeout);          dump_cfg_int(oForwardX11Timeout, o->forward_x11_timeout);
         dump_cfg_int(oNumberOfPasswordPrompts, o->number_of_password_prompts);          dump_cfg_int(oNumberOfPasswordPrompts, o->number_of_password_prompts);
Line 2543 
Line 2559 
         dump_cfg_string(oLocalCommand, o->local_command);          dump_cfg_string(oLocalCommand, o->local_command);
         dump_cfg_string(oLogLevel, log_level_name(o->log_level));          dump_cfg_string(oLogLevel, log_level_name(o->log_level));
         dump_cfg_string(oMacs, o->macs ? o->macs : KEX_CLIENT_MAC);          dump_cfg_string(oMacs, o->macs ? o->macs : KEX_CLIENT_MAC);
   #ifdef ENABLE_PKCS11
         dump_cfg_string(oPKCS11Provider, o->pkcs11_provider);          dump_cfg_string(oPKCS11Provider, o->pkcs11_provider);
   #endif
         dump_cfg_string(oPreferredAuthentications, o->preferred_authentications);          dump_cfg_string(oPreferredAuthentications, o->preferred_authentications);
         dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);          dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);
         dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);          dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
Legend:
Removed from v.1.265  
changed lines
  Added in v.1.266