[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.88 and 1.89

version 1.88, 2021/05/19 01:24:05 version 1.89, 2021/06/04 05:02:40
Line 1847 
Line 1847 
 {  {
         struct sshbuf *m;          struct sshbuf *m;
         char *e;          char *e;
         const char *term;          const char *term = NULL;
         u_int echar, rid, sid, esid, exitval, type, exitval_seen;          u_int echar, rid, sid, esid, exitval, type, exitval_seen;
         extern char **environ;          extern char **environ;
         int r, i, rawmode;          int r, i, rawmode;
Line 1864 
Line 1864 
         if (stdin_null_flag && stdfd_devnull(1, 0, 0) == -1)          if (stdin_null_flag && stdfd_devnull(1, 0, 0) == -1)
                 fatal_f("stdfd_devnull failed");                  fatal_f("stdfd_devnull failed");
   
         if ((term = getenv("TERM")) == NULL)          if ((term = lookup_env_in_list("TERM", options.setenv,
                 term = "";              options.num_setenv)) == NULL || *term == '\0')
                   term = getenv("TERM");
   
         echar = 0xffffffff;          echar = 0xffffffff;
         if (options.escape_char != SSH_ESCAPECHAR_NONE)          if (options.escape_char != SSH_ESCAPECHAR_NONE)
             echar = (u_int)options.escape_char;              echar = (u_int)options.escape_char;
Line 1880 
Line 1882 
             (r = sshbuf_put_u32(m, options.forward_agent)) != 0 ||              (r = sshbuf_put_u32(m, options.forward_agent)) != 0 ||
             (r = sshbuf_put_u32(m, subsystem_flag)) != 0 ||              (r = sshbuf_put_u32(m, subsystem_flag)) != 0 ||
             (r = sshbuf_put_u32(m, echar)) != 0 ||              (r = sshbuf_put_u32(m, echar)) != 0 ||
             (r = sshbuf_put_cstring(m, term)) != 0 ||              (r = sshbuf_put_cstring(m, term == NULL ? "" : term)) != 0 ||
             (r = sshbuf_put_stringb(m, command)) != 0)              (r = sshbuf_put_stringb(m, command)) != 0)
                 fatal_fr(r, "request");                  fatal_fr(r, "request");
   

Legend:
Removed from v.1.88  
changed lines
  Added in v.1.89