[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.416 and 1.417

version 1.416, 2015/03/03 06:48:58 version 1.417, 2015/04/17 13:16:48
Line 1623 
Line 1623 
         }          }
         /* Request X11 forwarding if enabled and DISPLAY is set. */          /* Request X11 forwarding if enabled and DISPLAY is set. */
         display = getenv("DISPLAY");          display = getenv("DISPLAY");
           if (display == NULL && options.forward_x11)
                   debug("X11 forwarding requested but DISPLAY not set");
         if (options.forward_x11 && display != NULL) {          if (options.forward_x11 && display != NULL) {
                 char *proto, *data;                  char *proto, *data;
                 /* Get reasonable local authentication information. */                  /* Get reasonable local authentication information. */
Line 1724 
Line 1726 
                 return; /* No need for error message, channels code sens one */                  return; /* No need for error message, channels code sens one */
   
         display = getenv("DISPLAY");          display = getenv("DISPLAY");
           if (display == NULL && options.forward_x11)
                   debug("X11 forwarding requested but DISPLAY not set");
         if (options.forward_x11 && display != NULL) {          if (options.forward_x11 && display != NULL) {
                 char *proto, *data;                  char *proto, *data;
                 /* Get reasonable local authentication information. */                  /* Get reasonable local authentication information. */
Legend:
Removed from v.1.416  
changed lines
  Added in v.1.417