[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.79 and 1.80

version 1.79, 2000/12/27 11:51:54 version 1.80, 2001/01/13 18:32:50
Line 841 
Line 841 
                 }                  }
         }          }
         /* Tell the packet module whether this is an interactive session. */          /* Tell the packet module whether this is an interactive session. */
         packet_set_interactive(interactive, options.keepalives);          packet_set_interactive(interactive);
   
   
         /* Request authentication agent forwarding if appropriate. */          /* Request authentication agent forwarding if appropriate. */
         check_agent_present();          check_agent_present();
   
Line 896 
Line 895 
 ssh_session2_callback(int id, void *arg)  ssh_session2_callback(int id, void *arg)
 {  {
         int len;          int len;
           int interactive = 0;
   
         debug("client_init id %d arg %d", id, (int)arg);          debug("client_init id %d arg %d", id, (int)arg);
   
         if (no_shell_flag)          if (no_shell_flag)
Line 919 
Line 920 
                 packet_put_int(ws.ws_ypixel);                  packet_put_int(ws.ws_ypixel);
                 packet_put_cstring("");         /* XXX: encode terminal modes */                  packet_put_cstring("");         /* XXX: encode terminal modes */
                 packet_send();                  packet_send();
                   interactive = 1;
                 /* XXX wait for reply */                  /* XXX wait for reply */
         }          }
         if (options.forward_x11 &&          if (options.forward_x11 &&
Line 929 
Line 931 
                 /* Request forwarding with authentication spoofing. */                  /* Request forwarding with authentication spoofing. */
                 debug("Requesting X11 forwarding with authentication spoofing.");                  debug("Requesting X11 forwarding with authentication spoofing.");
                 x11_request_forwarding_with_spoofing(id, proto, data);                  x11_request_forwarding_with_spoofing(id, proto, data);
                   interactive = 1;
                 /* XXX wait for reply */                  /* XXX wait for reply */
         }          }
   
Line 953 
Line 956 
         /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */          /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */
 done:  done:
         /* register different callback, etc. XXX */          /* register different callback, etc. XXX */
           packet_set_interactive(interactive);
         client_set_session_ident(id);          client_set_session_ident(id);
 }  }
   
Legend:
Removed from v.1.79  
changed lines
  Added in v.1.80