Merge commit 'origin/master'

diff --git a/configure.in b/configure.in
index effe65b..e2126a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [1.3])
+AM_INIT_AUTOMAKE([doldaconnect], [1.4])
 AM_CONFIG_HEADER(config.h)
 
 DOLDA_AC_GROUP([Checking build chain])

diff --git a/daemon/transfer.c b/daemon/transfer.c
index 16e3571..177353c 100644 (file)
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -193,7 +193,7 @@ static void dataerr(struct socket *sk, int errno, struct transfer *transfer)
            resettransfer(transfer);
        }
     } else if(transfer->dir == TRNSD_UP) {
-           transfer->close = 1;
+       transfer->close = 1;
     }
 }