[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit b69f107a2a5747fdb2abd79b098f43a9ea710dd1
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:17 2008 +0100

    Revert "add missing closesocket on error path (bb #1073)."
    
    This reverts commit 92c6b81790790f17153332be1427e91815887714.

diff --git a/ChangeLog b/ChangeLog
index cd5f288..07c9b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Mon Jun 30 21:14:03 EEST 2008 (edwin)
-------------------------------------
-  * freshclam/manager.c: add missing closesocket on error path (bb #1073).
-
 Wed Jun  4 14:18:12 CEST 2008 (tk)
 ----------------------------------
   * 0.93.1
diff --git a/freshclam/manager.c b/freshclam/manager.c
index 5c723c8..30c2e63 100644
--- a/freshclam/manager.c
+++ b/freshclam/manager.c
@@ -564,7 +564,6 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna
 
     if(send(sd, cmd, strlen(cmd), 0) < 0) {
 	logg("%cgetfile: Can't write to socket\n", logerr ? '!' : '^');
-	closesocket(sd);
 	return 52;
     }
 
@@ -586,7 +585,6 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna
 #endif
 	    logg("%cgetfile: Error while reading database from %s (IP: %s)\n", logerr ? '!' : '^', hostname, ipaddr);
 	    mirman_update(mdat->currip, mdat, 1);
-	    closesocket(sd);
 	    return 52;
 	}
 

-- 
Debian repository for ClamAV