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

Diff for /src/usr.bin/ssh/mux.c between version 1.54 and 1.55

version 1.54, 2015/08/19 23:18:26 version 1.55, 2015/10/15 23:51:40
Line 1725 
Line 1725 
                     fwd->connect_host ? fwd->connect_host : "",                      fwd->connect_host ? fwd->connect_host : "",
                     fwd->connect_port);                      fwd->connect_port);
                 if (muxclient_command == SSHMUX_COMMAND_FORWARD)                  if (muxclient_command == SSHMUX_COMMAND_FORWARD)
                         fprintf(stdout, "%u\n", fwd->allocated_port);                          fprintf(stdout, "%i\n", fwd->allocated_port);
                 break;                  break;
         case MUX_S_PERMISSION_DENIED:          case MUX_S_PERMISSION_DENIED:
                 e = buffer_get_string(&m, NULL);                  e = buffer_get_string(&m, NULL);
Line 2149 
Line 2149 
         case SSHMUX_COMMAND_ALIVE_CHECK:          case SSHMUX_COMMAND_ALIVE_CHECK:
                 if ((pid = mux_client_request_alive(sock)) == 0)                  if ((pid = mux_client_request_alive(sock)) == 0)
                         fatal("%s: master alive check failed", __func__);                          fatal("%s: master alive check failed", __func__);
                 fprintf(stderr, "Master running (pid=%d)\r\n", pid);                  fprintf(stderr, "Master running (pid=%u)\r\n", pid);
                 exit(0);                  exit(0);
         case SSHMUX_COMMAND_TERMINATE:          case SSHMUX_COMMAND_TERMINATE:
                 mux_client_request_terminate(sock);                  mux_client_request_terminate(sock);
Legend:
Removed from v.1.54  
changed lines
  Added in v.1.55