[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.472 and 1.473

version 1.472, 2018/02/11 21:16:56 version 1.473, 2018/02/13 03:36:56
Line 1505 
Line 1505 
   
         debug("%s: backgrounding master process", __func__);          debug("%s: backgrounding master process", __func__);
   
         /*          /*
          * master (current process) into the background, and make the           * master (current process) into the background, and make the
          * foreground process a client of the backgrounded master.           * foreground process a client of the backgrounded master.
          */           */
         switch ((pid = fork())) {          switch ((pid = fork())) {
         case -1:          case -1:
                 fatal("%s: fork: %s", __func__, strerror(errno));                  fatal("%s: fork: %s", __func__, strerror(errno));
         case 0:          case 0:
                 /* Child: master process continues mainloop */                  /* Child: master process continues mainloop */
                 break;                  break;
         default:          default:
                 /* Parent: set up mux slave to connect to backgrounded master */                  /* Parent: set up mux slave to connect to backgrounded master */
                 debug2("%s: background process is %ld", __func__, (long)pid);                  debug2("%s: background process is %ld", __func__, (long)pid);
                 stdin_null_flag = ostdin_null_flag;                  stdin_null_flag = ostdin_null_flag;
                 options.request_tty = orequest_tty;                  options.request_tty = orequest_tty;
                 tty_flag = otty_flag;                  tty_flag = otty_flag;
                 close(muxserver_sock);                  close(muxserver_sock);
                 muxserver_sock = -1;                  muxserver_sock = -1;
                 options.control_master = SSHCTL_MASTER_NO;                  options.control_master = SSHCTL_MASTER_NO;
                 muxclient(options.control_path);                  muxclient(options.control_path);
                 /* muxclient() doesn't return on success. */                  /* muxclient() doesn't return on success. */
                 fatal("Failed to connect to new control master");                  fatal("Failed to connect to new control master");
         }          }
         if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1) {          if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1) {
                 error("%s: open(\"/dev/null\"): %s", __func__,                  error("%s: open(\"/dev/null\"): %s", __func__,
                     strerror(errno));                      strerror(errno));
Line 1853 
Line 1853 
         if (!packet_get_mux())          if (!packet_get_mux())
                 muxserver_listen(ssh);                  muxserver_listen(ssh);
   
         /*          /*
          * If we are in control persist mode and have a working mux listen           * If we are in control persist mode and have a working mux listen
          * socket, then prepare to background ourselves and have a foreground           * socket, then prepare to background ourselves and have a foreground
          * client attach as a control slave.           * client attach as a control slave.
Line 1862 
Line 1862 
          * after the connection is fully established (in particular,           * after the connection is fully established (in particular,
          * async rfwd replies have been received for ExitOnForwardFailure).           * async rfwd replies have been received for ExitOnForwardFailure).
          */           */
         if (options.control_persist && muxserver_sock != -1) {          if (options.control_persist && muxserver_sock != -1) {
                 ostdin_null_flag = stdin_null_flag;                  ostdin_null_flag = stdin_null_flag;
                 ono_shell_flag = no_shell_flag;                  ono_shell_flag = no_shell_flag;
                 orequest_tty = options.request_tty;                  orequest_tty = options.request_tty;
                 otty_flag = tty_flag;                  otty_flag = tty_flag;
                 stdin_null_flag = 1;                  stdin_null_flag = 1;
                 no_shell_flag = 1;                  no_shell_flag = 1;
                 tty_flag = 0;                  tty_flag = 0;
                 if (!fork_after_authentication_flag)                  if (!fork_after_authentication_flag)
                         need_controlpersist_detach = 1;                          need_controlpersist_detach = 1;
                 fork_after_authentication_flag = 1;                  fork_after_authentication_flag = 1;
         }          }
         /*          /*
          * ControlPersist mux listen socket setup failed, attempt the           * ControlPersist mux listen socket setup failed, attempt the
          * stdio forward setup that we skipped earlier.           * stdio forward setup that we skipped earlier.
Legend:
Removed from v.1.472  
changed lines
  Added in v.1.473