From 43b3170fc4ca3584d91808905607b44c8363c8ca Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 25 Oct 2002 21:50:21 +0000 Subject: [PATCH] * ftpfs.c (linear_abort): Close data socket, ProFTPD 1.2.6 expects the client to close it. --- vfs/ChangeLog | 5 +++++ vfs/ftpfs.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 3dc459344..959b50c99 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,8 @@ +2002-10-25 Jindrich Makovicka + + * ftpfs.c (linear_abort): Close data socket, ProFTPD 1.2.6 + expects the client to close it. + 2002-10-13 Pavel Roskin * vfs.h: Remove tar_gzipped_memlimit. diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c index 292af5485..bdd476fa5 100644 --- a/vfs/ftpfs.c +++ b/vfs/ftpfs.c @@ -1019,6 +1019,10 @@ linear_abort (vfs *me, vfs_s_fh *fh) } } } + + if (dsock != -1) + close (dsock); + if ((get_reply (me, SUP.sock, NULL, 0) == TRANSIENT) && (code == 426)) get_reply (me, SUP.sock, NULL, 0); }