[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.338 and 1.339

version 1.338, 2020/10/07 02:18:45 version 1.339, 2020/10/16 13:26:13
Line 138 
Line 138 
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,          oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,          oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
         oTCPKeepAlive, oNumberOfPasswordPrompts,          oTCPKeepAlive, oNumberOfPasswordPrompts,
         oLogFacility, oLogLevel, oCiphers, oMacs,          oLogFacility, oLogLevel, oLogVerbose, oCiphers, oMacs,
         oPubkeyAuthentication,          oPubkeyAuthentication,
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,          oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
         oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,          oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
Line 249 
Line 249 
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
         { "syslogfacility", oLogFacility },          { "syslogfacility", oLogFacility },
         { "loglevel", oLogLevel },          { "loglevel", oLogLevel },
           { "logverbose", oLogVerbose },
         { "dynamicforward", oDynamicForward },          { "dynamicforward", oDynamicForward },
         { "preferredauthentications", oPreferredAuthentications },          { "preferredauthentications", oPreferredAuthentications },
         { "hostkeyalgorithms", oHostKeyAlgorithms },          { "hostkeyalgorithms", oHostKeyAlgorithms },
Line 887 
Line 888 
     int linenum, int *activep, int flags, int *want_final_pass, int depth)      int linenum, int *activep, int flags, int *want_final_pass, int depth)
 {  {
         char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;          char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;
         char **cpptr, fwdarg[256];          char **cpptr, ***cppptr, fwdarg[256];
         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;
         int remotefwd, dynamicfwd;          int remotefwd, dynamicfwd;
Line 1335 
Line 1336 
                         *log_facility_ptr = (SyslogFacility) value;                          *log_facility_ptr = (SyslogFacility) value;
                 break;                  break;
   
           case oLogVerbose:
                   cppptr = &options->log_verbose;
                   uintptr = &options->num_log_verbose;
                   if (*activep && *uintptr == 0) {
                           while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
                                   *cppptr = xrecallocarray(*cppptr, *uintptr,
                                       *uintptr + 1, sizeof(**cppptr));
                                   (*cppptr)[(*uintptr)++] = xstrdup(arg);
                           }
                   }
                   return 0;
   
         case oLocalForward:          case oLocalForward:
         case oRemoteForward:          case oRemoteForward:
         case oDynamicForward:          case oDynamicForward:
Line 1990 
Line 2003 
         options->num_remote_forwards = 0;          options->num_remote_forwards = 0;
         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->preferred_authentications = NULL;          options->preferred_authentications = NULL;
         options->bind_address = NULL;          options->bind_address = NULL;
         options->bind_interface = NULL;          options->bind_interface = NULL;
Line 2818 
Line 2833 
         dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles);          dump_cfg_strarray_oneline(oUserKnownHostsFile, o->num_user_hostfiles, o->user_hostfiles);
         dump_cfg_strarray(oSendEnv, o->num_send_env, o->send_env);          dump_cfg_strarray(oSendEnv, o->num_send_env, o->send_env);
         dump_cfg_strarray(oSetEnv, o->num_setenv, o->setenv);          dump_cfg_strarray(oSetEnv, o->num_setenv, o->setenv);
           dump_cfg_strarray_oneline(oLogVerbose,
               o->num_log_verbose, o->log_verbose);
   
         /* Special cases */          /* Special cases */
   
Legend:
Removed from v.1.338  
changed lines
  Added in v.1.339