[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.270 and 1.271

version 1.270, 2017/03/10 04:27:32 version 1.271, 2017/04/28 03:20:27
Line 137 
Line 137 
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,          oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,          oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
         oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts,          oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts,
         oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs,          oUsePrivilegedPort, oLogFacility, oLogLevel, oCiphers, oProtocol, oMacs,
         oPubkeyAuthentication,          oPubkeyAuthentication,
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,          oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
         oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,          oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
Line 250 
Line 250 
         { "tcpkeepalive", oTCPKeepAlive },          { "tcpkeepalive", oTCPKeepAlive },
         { "keepalive", oTCPKeepAlive },                         /* obsolete */          { "keepalive", oTCPKeepAlive },                         /* obsolete */
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
           { "syslogfacility", oLogFacility },
         { "loglevel", oLogLevel },          { "loglevel", oLogLevel },
         { "dynamicforward", oDynamicForward },          { "dynamicforward", oDynamicForward },
         { "preferredauthentications", oPreferredAuthentications },          { "preferredauthentications", oPreferredAuthentications },
Line 815 
Line 816 
         u_int i, *uintptr, max_entries = 0;          u_int i, *uintptr, max_entries = 0;
         int r, oactive, negated, opcode, *intptr, value, value2, cmdline = 0;          int r, oactive, negated, opcode, *intptr, value, value2, cmdline = 0;
         LogLevel *log_level_ptr;          LogLevel *log_level_ptr;
           SyslogFacility *log_facility_ptr;
         long long val64;          long long val64;
         size_t len;          size_t len;
         struct Forward fwd;          struct Forward fwd;
Line 1249 
Line 1251 
                         *log_level_ptr = (LogLevel) value;                          *log_level_ptr = (LogLevel) value;
                 break;                  break;
   
           case oLogFacility:
                   log_facility_ptr = &options->log_facility;
                   arg = strdelim(&s);
                   value = log_facility_number(arg);
                   if (value == SYSLOG_FACILITY_NOT_SET)
                           fatal("%.200s line %d: unsupported log facility '%s'",
                               filename, linenum, arg ? arg : "<NONE>");
                   if (*log_facility_ptr == -1)
                           *log_facility_ptr = (SyslogFacility) value;
                   break;
   
         case oLocalForward:          case oLocalForward:
         case oRemoteForward:          case oRemoteForward:
         case oDynamicForward:          case oDynamicForward:
Line 1823 
Line 1836 
         options->num_local_forwards = 0;          options->num_local_forwards = 0;
         options->remote_forwards = NULL;          options->remote_forwards = NULL;
         options->num_remote_forwards = 0;          options->num_remote_forwards = 0;
           options->log_facility = SYSLOG_FACILITY_NOT_SET;
         options->log_level = SYSLOG_LEVEL_NOT_SET;          options->log_level = SYSLOG_LEVEL_NOT_SET;
         options->preferred_authentications = NULL;          options->preferred_authentications = NULL;
         options->bind_address = NULL;          options->bind_address = NULL;
Line 1997 
Line 2011 
         }          }
         if (options->log_level == SYSLOG_LEVEL_NOT_SET)          if (options->log_level == SYSLOG_LEVEL_NOT_SET)
                 options->log_level = SYSLOG_LEVEL_INFO;                  options->log_level = SYSLOG_LEVEL_INFO;
           if (options->log_facility == SYSLOG_FACILITY_NOT_SET)
                   options->log_facility = SYSLOG_FACILITY_USER;
         if (options->no_host_authentication_for_localhost == - 1)          if (options->no_host_authentication_for_localhost == - 1)
                 options->no_host_authentication_for_localhost = 0;                  options->no_host_authentication_for_localhost = 0;
         if (options->identities_only == -1)          if (options->identities_only == -1)
Legend:
Removed from v.1.270  
changed lines
  Added in v.1.271