[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.58 and 1.59

version 1.58, 2001/01/21 19:05:53 version 1.59, 2001/01/22 23:06:39
Line 93 
Line 93 
         oBadOption,          oBadOption,
         oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,          oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,
         oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh,          oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh,
         oSkeyAuthentication, oXAuthLocation,          oChallengeResponseAuthentication, oXAuthLocation,
 #ifdef KRB4  #ifdef KRB4
         oKerberosAuthentication,          oKerberosAuthentication,
 #endif /* KRB4 */  #endif /* KRB4 */
Line 104 
Line 104 
         oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,          oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,          oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,          oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
         oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, oTISAuthentication,          oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts,
         oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol,          oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol,
         oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication,          oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication,
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias          oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias
Line 127 
Line 127 
         { "kbdinteractivedevices", oKbdInteractiveDevices },          { "kbdinteractivedevices", oKbdInteractiveDevices },
         { "rsaauthentication", oRSAAuthentication },          { "rsaauthentication", oRSAAuthentication },
         { "pubkeyauthentication", oPubkeyAuthentication },          { "pubkeyauthentication", oPubkeyAuthentication },
         { "dsaauthentication", oPubkeyAuthentication },         /* alias */          { "dsaauthentication", oPubkeyAuthentication },             /* alias */
         { "skeyauthentication", oSkeyAuthentication },          { "challengeresponseauthentication", oChallengeResponseAuthentication },
           { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */
           { "tisauthentication", oChallengeResponseAuthentication },  /* alias */
 #ifdef KRB4  #ifdef KRB4
         { "kerberosauthentication", oKerberosAuthentication },          { "kerberosauthentication", oKerberosAuthentication },
 #endif /* KRB4 */  #endif /* KRB4 */
Line 165 
Line 167 
         { "compressionlevel", oCompressionLevel },          { "compressionlevel", oCompressionLevel },
         { "keepalive", oKeepAlives },          { "keepalive", oKeepAlives },
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
         { "tisauthentication", oTISAuthentication },  
         { "loglevel", oLogLevel },          { "loglevel", oLogLevel },
         { NULL, 0 }          { NULL, 0 }
 };  };
Line 316 
Line 317 
                 intptr = &options->rhosts_rsa_authentication;                  intptr = &options->rhosts_rsa_authentication;
                 goto parse_flag;                  goto parse_flag;
   
         case oTISAuthentication:          case oChallengeResponseAuthentication:
                 /* fallthrough, there is no difference on the client side */                  intptr = &options->challenge_reponse_authentication;
         case oSkeyAuthentication:  
                 intptr = &options->skey_authentication;  
                 goto parse_flag;                  goto parse_flag;
   
 #ifdef KRB4  #ifdef KRB4
Line 667 
Line 666 
         options->rhosts_authentication = -1;          options->rhosts_authentication = -1;
         options->rsa_authentication = -1;          options->rsa_authentication = -1;
         options->pubkey_authentication = -1;          options->pubkey_authentication = -1;
         options->skey_authentication = -1;          options->challenge_reponse_authentication = -1;
 #ifdef KRB4  #ifdef KRB4
         options->kerberos_authentication = -1;          options->kerberos_authentication = -1;
 #endif  #endif
Line 734 
Line 733 
                 options->rsa_authentication = 1;                  options->rsa_authentication = 1;
         if (options->pubkey_authentication == -1)          if (options->pubkey_authentication == -1)
                 options->pubkey_authentication = 1;                  options->pubkey_authentication = 1;
         if (options->skey_authentication == -1)          if (options->challenge_reponse_authentication == -1)
                 options->skey_authentication = 0;                  options->challenge_reponse_authentication = 0;
 #ifdef KRB4  #ifdef KRB4
         if (options->kerberos_authentication == -1)          if (options->kerberos_authentication == -1)
                 options->kerberos_authentication = 1;                  options->kerberos_authentication = 1;
Line 749 
Line 748 
         if (options->password_authentication == -1)          if (options->password_authentication == -1)
                 options->password_authentication = 1;                  options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)          if (options->kbd_interactive_authentication == -1)
                 options->kbd_interactive_authentication = 0;                  options->kbd_interactive_authentication = 1;
         if (options->rhosts_rsa_authentication == -1)          if (options->rhosts_rsa_authentication == -1)
                 options->rhosts_rsa_authentication = 1;                  options->rhosts_rsa_authentication = 1;
         if (options->fallback_to_rsh == -1)          if (options->fallback_to_rsh == -1)
Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59