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

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.80 and 1.81

version 1.80, 2000/11/06 23:13:26 version 1.81, 2000/11/06 23:16:35
Line 313 
Line 313 
         int remote_major, remote_minor, i, mismatch;          int remote_major, remote_minor, i, mismatch;
         int connection_in = packet_get_connection_in();          int connection_in = packet_get_connection_in();
         int connection_out = packet_get_connection_out();          int connection_out = packet_get_connection_out();
           int minor1 = PROTOCOL_MINOR_1;
   
         /* Read other side\'s version identification. */          /* Read other side\'s version identification. */
         for (;;) {          for (;;) {
Line 366 
Line 367 
                 }                  }
                 if (remote_minor < 3) {                  if (remote_minor < 3) {
                         fatal("Remote machine has too old SSH software version.");                          fatal("Remote machine has too old SSH software version.");
                 } else if (remote_minor == 3) {                  } else if (remote_minor == 3 || remote_minor == 4) {
                         /* We speak 1.3, too. */                          /* We speak 1.3, too. */
                         enable_compat13();                          enable_compat13();
                           minor1 = 3;
                         if (options.forward_agent) {                          if (options.forward_agent) {
                                 log("Agent forwarding disabled for protocol 1.3");                                  log("Agent forwarding disabled for protocol 1.3");
                                 options.forward_agent = 0;                                  options.forward_agent = 0;
Line 394 
Line 396 
         /* Send our own protocol version identification. */          /* Send our own protocol version identification. */
         snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n",          snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n",
             compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1,              compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1,
             compat20 ? PROTOCOL_MINOR_2 : PROTOCOL_MINOR_1,              compat20 ? PROTOCOL_MINOR_2 : minor1,
             SSH_VERSION);              SSH_VERSION);
         if (atomicio(write, connection_out, buf, strlen(buf)) != strlen(buf))          if (atomicio(write, connection_out, buf, strlen(buf)) != strlen(buf))
                 fatal("write: %.100s", strerror(errno));                  fatal("write: %.100s", strerror(errno));
Legend:
Removed from v.1.80  
changed lines
  Added in v.1.81