[BACK]Return to ssh.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh.c between version 1.561 and 1.562

version 1.561, 2021/07/17 00:36:53 version 1.562, 2021/07/17 00:38:11
Line 1310 
Line 1310 
   
         /* Cannot fork to background if no command. */          /* Cannot fork to background if no command. */
         if (fork_after_authentication_flag && sshbuf_len(command) == 0 &&          if (fork_after_authentication_flag && sshbuf_len(command) == 0 &&
             options.remote_command == NULL && options.session_type != SESSION_TYPE_NONE)              options.remote_command == NULL &&
               options.session_type != SESSION_TYPE_NONE)
                 fatal("Cannot fork into background without a command "                  fatal("Cannot fork into background without a command "
                     "to execute.");                      "to execute.");
   
Line 2041 
Line 2042 
         if ((term = lookup_env_in_list("TERM", options.setenv,          if ((term = lookup_env_in_list("TERM", options.setenv,
             options.num_setenv)) == NULL || *term == '\0')              options.num_setenv)) == NULL || *term == '\0')
                 term = getenv("TERM");                  term = getenv("TERM");
         client_session2_setup(ssh, id, tty_flag, options.session_type == SESSION_TYPE_SUBSYSTEM, term,          client_session2_setup(ssh, id, tty_flag,
               options.session_type == SESSION_TYPE_SUBSYSTEM, term,
             NULL, fileno(stdin), command, environ);              NULL, fileno(stdin), command, environ);
 }  }
   
Line 2129 
Line 2131 
                 options.session_type = SESSION_TYPE_NONE;                  options.session_type = SESSION_TYPE_NONE;
                 tty_flag = 0;                  tty_flag = 0;
                 if (!fork_after_authentication_flag &&                  if (!fork_after_authentication_flag &&
                     (osession_type != SESSION_TYPE_NONE || options.stdio_forward_host != NULL))                      (osession_type != SESSION_TYPE_NONE ||
                       options.stdio_forward_host != NULL))
                         need_controlpersist_detach = 1;                          need_controlpersist_detach = 1;
                 fork_after_authentication_flag = 1;                  fork_after_authentication_flag = 1;
         }          }

Legend:
Removed from v.1.561  
changed lines
  Added in v.1.562