From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 19 Oct 2008 15:49:50 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=f512aed7b27da19b8af8643e6e93a35b4f9a1c12;hp=78ba3ee1d71032a1325036d5cefa8d0549d76ccd

Merge commit 'origin/master'
---

diff --git a/configure.in b/configure.in
index effe65b..e2126a6 100644
--- 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
--- 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;
     }
 }