diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2002-04-25 14:06:47 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2002-04-25 14:06:47 +0000 |
| commit | 421123b0f0fca3439ea84f850e07b6d452d8c04d (patch) | |
| tree | 97021088f7a1d3eea187c98f0b3d148dcfedc0dc /Src/Modules/zftp.c | |
| parent | f630c8abf4844dfcb84a21ec558f3c28726312ca (diff) | |
| download | zsh-421123b0f0fca3439ea84f850e07b6d452d8c04d.tar.gz zsh-421123b0f0fca3439ea84f850e07b6d452d8c04d.tar.xz zsh-421123b0f0fca3439ea84f850e07b6d452d8c04d.zip | |
17040: Src/Modules/tcp.c: AF_INET6 wasn't copied into the
socket structure for IPv6. 17041: Src/Modules/zftp.c: Minor but fatal typos creating a data connection for zftp using IPv6.
Diffstat (limited to 'Src/Modules/zftp.c')
| -rw-r--r-- | Src/Modules/zftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 6ee0f0156..80e09045c 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -863,7 +863,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) zwarnnam(name, "Must set preference S or P to transfer data", NULL, 0); return 1; } - zfsess->dfd = socket(AF_INET, SOCK_STREAM, 0); + zfsess->dfd = socket(zfsess->control->peer.a.sa_family, SOCK_STREAM, 0); if (zfsess->dfd < 0) { zwarnnam(name, "can't get data socket: %e", NULL, errno); return 1; @@ -907,7 +907,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) delim = ptr[1]; if(delim < 33 || delim > 126 || ptr[2] != delim || ptr[3] != delim) goto bad_epsv; - ptr += 3; + ptr += 4; end = strchr(ptr, delim); if(!end || end[1] != ')') goto bad_epsv; |