[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.248 and 1.249

version 1.248, 2013/12/06 13:39:49 version 1.249, 2014/01/29 06:18:35
Line 138 
Line 138 
         options->chroot_directory = NULL;          options->chroot_directory = NULL;
         options->authorized_keys_command = NULL;          options->authorized_keys_command = NULL;
         options->authorized_keys_command_user = NULL;          options->authorized_keys_command_user = NULL;
         options->zero_knowledge_password_authentication = -1;  
         options->revoked_keys_file = NULL;          options->revoked_keys_file = NULL;
         options->trusted_user_ca_keys = NULL;          options->trusted_user_ca_keys = NULL;
         options->authorized_principals_file = NULL;          options->authorized_principals_file = NULL;
Line 279 
Line 278 
         }          }
         if (options->permit_tun == -1)          if (options->permit_tun == -1)
                 options->permit_tun = SSH_TUNMODE_NO;                  options->permit_tun = SSH_TUNMODE_NO;
         if (options->zero_knowledge_password_authentication == -1)  
                 options->zero_knowledge_password_authentication = 0;  
         if (options->ip_qos_interactive == -1)          if (options->ip_qos_interactive == -1)
                 options->ip_qos_interactive = IPTOS_LOWDELAY;                  options->ip_qos_interactive = IPTOS_LOWDELAY;
         if (options->ip_qos_bulk == -1)          if (options->ip_qos_bulk == -1)
Line 317 
Line 314 
         sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,          sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
         sMatch, sPermitOpen, sForceCommand, sChrootDirectory,          sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation, sAllowAgentForwarding,          sUsePrivilegeSeparation, sAllowAgentForwarding,
         sZeroKnowledgePasswordAuthentication, sHostCertificate,          sHostCertificate,
         sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,          sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
         sKexAlgorithms, sIPQoS, sVersionAddendum,          sKexAlgorithms, sIPQoS, sVersionAddendum,
         sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,          sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,
Line 377 
Line 374 
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },          { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
         { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },          { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
         { "skeyauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, /* alias */          { "skeyauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, /* alias */
 #ifdef JPAKE  
         { "zeroknowledgepasswordauthentication", sZeroKnowledgePasswordAuthentication, SSHCFG_ALL },  
 #else  
         { "zeroknowledgepasswordauthentication", sUnsupported, SSHCFG_ALL },  
 #endif  
         { "checkmail", sDeprecated, SSHCFG_GLOBAL },          { "checkmail", sDeprecated, SSHCFG_GLOBAL },
         { "listenaddress", sListenAddress, SSHCFG_GLOBAL },          { "listenaddress", sListenAddress, SSHCFG_GLOBAL },
         { "addressfamily", sAddressFamily, SSHCFG_GLOBAL },          { "addressfamily", sAddressFamily, SSHCFG_GLOBAL },
Line 1055 
Line 1047 
                 intptr = &options->password_authentication;                  intptr = &options->password_authentication;
                 goto parse_flag;                  goto parse_flag;
   
         case sZeroKnowledgePasswordAuthentication:  
                 intptr = &options->zero_knowledge_password_authentication;  
                 goto parse_flag;  
   
         case sKbdInteractiveAuthentication:          case sKbdInteractiveAuthentication:
                 intptr = &options->kbd_interactive_authentication;                  intptr = &options->kbd_interactive_authentication;
                 goto parse_flag;                  goto parse_flag;
Line 1720 
Line 1708 
         M_CP_INTOPT(hostbased_authentication);          M_CP_INTOPT(hostbased_authentication);
         M_CP_INTOPT(hostbased_uses_name_from_packet_only);          M_CP_INTOPT(hostbased_uses_name_from_packet_only);
         M_CP_INTOPT(kbd_interactive_authentication);          M_CP_INTOPT(kbd_interactive_authentication);
         M_CP_INTOPT(zero_knowledge_password_authentication);  
         M_CP_INTOPT(permit_root_login);          M_CP_INTOPT(permit_root_login);
         M_CP_INTOPT(permit_empty_passwd);          M_CP_INTOPT(permit_empty_passwd);
   
Line 1957 
Line 1944 
 #ifdef GSSAPI  #ifdef GSSAPI
         dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);          dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
         dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);          dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
 #endif  
 #ifdef JPAKE  
         dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication,  
             o->zero_knowledge_password_authentication);  
 #endif  #endif
         dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);          dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
         dump_cfg_fmtint(sKbdInteractiveAuthentication,          dump_cfg_fmtint(sKbdInteractiveAuthentication,
Legend:
Removed from v.1.248  
changed lines
  Added in v.1.249