[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.369 and 1.370

version 1.369, 2020/08/28 03:15:52 version 1.370, 2020/10/16 13:26:13
Line 104 
Line 104 
         options->tcp_keep_alive = -1;          options->tcp_keep_alive = -1;
         options->log_facility = SYSLOG_FACILITY_NOT_SET;          options->log_facility = SYSLOG_FACILITY_NOT_SET;
         options->log_level = SYSLOG_LEVEL_NOT_SET;          options->log_level = SYSLOG_LEVEL_NOT_SET;
           options->num_log_verbose = 0;
           options->log_verbose = NULL;
         options->hostbased_authentication = -1;          options->hostbased_authentication = -1;
         options->hostbased_uses_name_from_packet_only = -1;          options->hostbased_uses_name_from_packet_only = -1;
         options->hostbased_key_types = NULL;          options->hostbased_key_types = NULL;
Line 476 
Line 478 
 typedef enum {  typedef enum {
         sBadOption,             /* == unknown option */          sBadOption,             /* == unknown option */
         sPort, sHostKeyFile, sLoginGraceTime,          sPort, sHostKeyFile, sLoginGraceTime,
         sPermitRootLogin, sLogFacility, sLogLevel,          sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose,
         sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,          sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,
         sKerberosGetAFSToken, sChallengeResponseAuthentication,          sKerberosGetAFSToken, sChallengeResponseAuthentication,
         sPasswordAuthentication, sKbdInteractiveAuthentication,          sPasswordAuthentication, sKbdInteractiveAuthentication,
Line 532 
Line 534 
         { "permitrootlogin", sPermitRootLogin, SSHCFG_ALL },          { "permitrootlogin", sPermitRootLogin, SSHCFG_ALL },
         { "syslogfacility", sLogFacility, SSHCFG_GLOBAL },          { "syslogfacility", sLogFacility, SSHCFG_GLOBAL },
         { "loglevel", sLogLevel, SSHCFG_ALL },          { "loglevel", sLogLevel, SSHCFG_ALL },
           { "logverbose", sLogVerbose, SSHCFG_ALL },
         { "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },          { "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },
         { "rhostsrsaauthentication", sDeprecated, SSHCFG_ALL },          { "rhostsrsaauthentication", sDeprecated, SSHCFG_ALL },
         { "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },          { "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
Line 1659 
Line 1662 
                         *log_level_ptr = (LogLevel) value;                          *log_level_ptr = (LogLevel) value;
                 break;                  break;
   
           case sLogVerbose:
                   while ((arg = strdelim(&cp)) && *arg != '\0') {
                           if (!*activep)
                                   continue;
                           array_append(filename, linenum, "oLogVerbose",
                               &options->log_verbose, &options->num_log_verbose,
                               arg);
                   }
                   break;
   
         case sAllowTcpForwarding:          case sAllowTcpForwarding:
                 intptr = &options->allow_tcp_forwarding;                  intptr = &options->allow_tcp_forwarding;
                 multistate_ptr = multistate_tcpfwd;                  multistate_ptr = multistate_tcpfwd;
Line 2813 
Line 2826 
         dump_cfg_strarray(sSetEnv, o->num_setenv, o->setenv);          dump_cfg_strarray(sSetEnv, o->num_setenv, o->setenv);
         dump_cfg_strarray_oneline(sAuthenticationMethods,          dump_cfg_strarray_oneline(sAuthenticationMethods,
             o->num_auth_methods, o->auth_methods);              o->num_auth_methods, o->auth_methods);
           dump_cfg_strarray_oneline(sLogVerbose,
               o->num_log_verbose, o->log_verbose);
   
         /* other arguments */          /* other arguments */
         for (i = 0; i < o->num_subsystems; i++)          for (i = 0; i < o->num_subsystems; i++)
Legend:
Removed from v.1.369  
changed lines
  Added in v.1.370