[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.63 and 1.64

version 1.63, 2016/10/19 23:21:56 version 1.64, 2017/01/21 11:32:04
Line 2163 
Line 2163 
   
         memset(&addr, '\0', sizeof(addr));          memset(&addr, '\0', sizeof(addr));
         addr.sun_family = AF_UNIX;          addr.sun_family = AF_UNIX;
         addr.sun_len = offsetof(struct sockaddr_un, sun_path) +  
             strlen(path) + 1;  
   
         if (strlcpy(addr.sun_path, path,          if (strlcpy(addr.sun_path, path,
             sizeof(addr.sun_path)) >= sizeof(addr.sun_path))              sizeof(addr.sun_path)) >= sizeof(addr.sun_path))
Line 2174 
Line 2172 
         if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)          if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
                 fatal("%s socket(): %s", __func__, strerror(errno));                  fatal("%s socket(): %s", __func__, strerror(errno));
   
         if (connect(sock, (struct sockaddr *)&addr, addr.sun_len) == -1) {          if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
                 switch (muxclient_command) {                  switch (muxclient_command) {
                 case SSHMUX_COMMAND_OPEN:                  case SSHMUX_COMMAND_OPEN:
                 case SSHMUX_COMMAND_STDIO_FWD:                  case SSHMUX_COMMAND_STDIO_FWD:
Legend:
Removed from v.1.63  
changed lines
  Added in v.1.64