From ff3e8d6ee5188e4322c59e297687351bd20dee7b Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 25 Apr 2002 14:48:21 +0000 Subject: 17041: Src/Modules/zftp.c: Typos creating a data connection for zftp using IPv6. --- ChangeLog | 5 +++++ Src/Modules/zftp.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aadc92d2e..99f39d8ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-25 Peter Stephenson + + * 17041: Src/Modules/zftp.c: Typos creating a data connection + for zftp using IPv6. + 2002-04-25 Sven Wischnowsky * 17035: Src/Modules/zutil.c: remove one half of 17029; the diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 46ba71cbc..29ae98de5 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -1041,7 +1041,7 @@ zfopendata(char *name, union zftp_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->peer.a.sa_family, SOCK_STREAM, 0); if (zfsess->dfd < 0) { zwarnnam(name, "can't get data socket: %e", NULL, errno); return 1; @@ -1085,7 +1085,7 @@ zfopendata(char *name, union zftp_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; -- cgit 1.4.1