[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.269 and 1.270

version 1.269, 2015/11/20 01:45:29 version 1.270, 2016/01/14 16:17:40
Line 49 
Line 49 
 #include "readconf.h"  #include "readconf.h"
 #include "atomicio.h"  #include "atomicio.h"
 #include "dns.h"  #include "dns.h"
 #include "roaming.h"  
 #include "monitor_fdpass.h"  #include "monitor_fdpass.h"
 #include "ssh2.h"  #include "ssh2.h"
 #include "version.h"  #include "version.h"
Line 522 
Line 521 
                 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",                  xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
                     PROTOCOL_MAJOR_1, minor1, SSH_VERSION);                      PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
         }          }
         if (roaming_atomicio(vwrite, connection_out, client_version_string,          if (atomicio(vwrite, connection_out, client_version_string,
             strlen(client_version_string)) != strlen(client_version_string))              strlen(client_version_string)) != strlen(client_version_string))
                 fatal("write: %.100s", strerror(errno));                  fatal("write: %.100s", strerror(errno));
         chop(client_version_string);          chop(client_version_string);
Line 582 
Line 581 
                                 }                                  }
                         }                          }
   
                         len = roaming_atomicio(read, connection_in, &buf[i], 1);                          len = atomicio(read, connection_in, &buf[i], 1);
   
                         if (len != 1 && errno == EPIPE)                          if (len != 1 && errno == EPIPE)
                                 fatal("ssh_exchange_identification: "                                  fatal("ssh_exchange_identification: "
Legend:
Removed from v.1.269  
changed lines
  Added in v.1.270