Merge branch 'master' of etorok@git.clam.sourcefire.com:/var/lib/git/clamav-devel

* 'master' of etorok@git.clam.sourcefire.com:/var/lib/git/clamav-devel:
  bb#1643
  update ignore files

.gitignore

@@ -0,0 +1,15 @@
+*.[oa]
+*.l[oa]
+*~
+*.swp
+TAGS
+Makefile
+.deps
+.libs
+clamav-config*
+libtool
+stamp-h1
+target.h
+config.log
+config.status
+libclamav.pc

ChangeLog

@@ -1,3 +1,7 @@
+Mon Jun 29 11:25:46 CEST 2009 (acab)
+------------------------------------
+ * clamav-milter/netcode.c: Properly handle clamd disconnection (bb#1643)
+
 Mon Jun 22 17:19:45 CEST 2009 (acab)
 ------------------------------------
  * clamav-milter/whitelist.c: print failed whitelist filename

clamav-milter/.gitignore

@@ -0,0 +1 @@
+clamav-milter

clamav-milter/netcode.c

@@ -148,6 +148,11 @@ int nc_send(int s, const void *buff, size_t len) {
 	struct timeval tv;
 	char er[256];
 
+	if(!res) {
+	    logg("!Connection closed while sending data\n");
+	    close(s);
+	    return 1;
+	}
 	if(res!=-1) {
 	    len-=res;
 	    buf+=res;
@@ -245,6 +250,11 @@ char *nc_recv(int s) {
 	}
 
 	res = recv(s, &buf[len], sizeof(buf) - len, 0);
+	if(!res) {
+	    logg("!Connection closed while reading from socket\n");
+	    close(s);
+	    return NULL;
+	}
 	if(res==-1) {
 	    char er[256];
 	    strerror_print("!recv failed after successful select");

clambc/.gitignore

@@ -0,0 +1 @@
+clambc

clamconf/.gitignore

@@ -0,0 +1 @@
+clamconf

clamd/.gitignore

@@ -0,0 +1 @@
+clamd

clamdscan/.gitignore

@@ -0,0 +1 @@
+clamdscan

clamdtop/.gitignore

@@ -0,0 +1 @@
+clamdtop

clamscan/.gitignore

@@ -0,0 +1 @@
+clamscan

docs/man/.gitignore

@@ -0,0 +1,3 @@
+*.1
+*.5
+*.8

freshclam/.gitignore

@@ -0,0 +1 @@
+freshclam

libclamav/.gitignore

@@ -0,0 +1,2 @@
+version.h
+version.h.tmp

sigtool/.gitignore

@@ -0,0 +1 @@
+sigtool

test/.gitignore

@@ -0,0 +1 @@
+clam*