[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.380 and 1.381

version 1.380, 2021/06/08 07:09:42 version 1.381, 2021/07/02 05:11:21
Line 122 
Line 122 
         options->gss_strict_acceptor = -1;          options->gss_strict_acceptor = -1;
         options->password_authentication = -1;          options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;          options->kbd_interactive_authentication = -1;
         options->challenge_response_authentication = -1;  
         options->permit_empty_passwd = -1;          options->permit_empty_passwd = -1;
         options->permit_user_env = -1;          options->permit_user_env = -1;
         options->permit_user_env_allowlist = NULL;          options->permit_user_env_allowlist = NULL;
Line 339 
Line 338 
         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->challenge_response_authentication == -1)  
                 options->challenge_response_authentication = 1;  
         if (options->permit_empty_passwd == -1)          if (options->permit_empty_passwd == -1)
                 options->permit_empty_passwd = 0;                  options->permit_empty_passwd = 0;
         if (options->permit_user_env == -1) {          if (options->permit_user_env == -1) {
Line 558 
Line 555 
 #endif  #endif
         { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },          { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },          { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
         { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },          { "challengeresponseauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, /* alias */
         { "skeyauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, /* alias */          { "skeyauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, /* alias */
         { "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 1538 
Line 1535 
                 intptr = &options->kbd_interactive_authentication;                  intptr = &options->kbd_interactive_authentication;
                 goto parse_flag;                  goto parse_flag;
   
         case sChallengeResponseAuthentication:  
                 intptr = &options->challenge_response_authentication;  
                 goto parse_flag;  
   
         case sPrintMotd:          case sPrintMotd:
                 intptr = &options->print_motd;                  intptr = &options->print_motd;
                 goto parse_flag;                  goto parse_flag;
Line 2837 
Line 2830 
         dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);          dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
         dump_cfg_fmtint(sKbdInteractiveAuthentication,          dump_cfg_fmtint(sKbdInteractiveAuthentication,
             o->kbd_interactive_authentication);              o->kbd_interactive_authentication);
         dump_cfg_fmtint(sChallengeResponseAuthentication,  
             o->challenge_response_authentication);  
         dump_cfg_fmtint(sPrintMotd, o->print_motd);          dump_cfg_fmtint(sPrintMotd, o->print_motd);
         dump_cfg_fmtint(sPrintLastLog, o->print_lastlog);          dump_cfg_fmtint(sPrintLastLog, o->print_lastlog);
         dump_cfg_fmtint(sX11Forwarding, o->x11_forwarding);          dump_cfg_fmtint(sX11Forwarding, o->x11_forwarding);

Legend:
Removed from v.1.380  
changed lines
  Added in v.1.381