git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@637 77e5149b-7576-45b1-b177-96237e5ba77b
Nigel Horne authored on 2004/06/28 17:30:18... | ... |
@@ -413,6 +413,8 @@ Changes |
413 | 413 |
to unlock not locked mutex since we have no control |
414 | 414 |
over when clamfi_abort() is called |
415 | 415 |
Remove warning message on FreeBSD5.2 |
416 |
+0.73d 28/6/04 Don't error when creating the quarantine directory if it |
|
417 |
+ already exists |
|
416 | 418 |
|
417 | 419 |
BUG REPORTS |
418 | 420 |
|
... | ... |
@@ -26,6 +26,9 @@ |
26 | 26 |
* |
27 | 27 |
* Change History: |
28 | 28 |
* $Log: clamav-milter.c,v $ |
29 |
+ * Revision 1.99 2004/06/28 08:30:18 nigelhorne |
|
30 |
+ * Don't error when creating the quarantine directory if it already exists |
|
31 |
+ * |
|
29 | 32 |
* Revision 1.98 2004/06/22 04:09:12 nigelhorne |
30 | 33 |
* Avoid unlocking unlocked mutex in clamfi_abort |
31 | 34 |
* |
... | ... |
@@ -305,9 +308,9 @@ |
305 | 305 |
* Revision 1.6 2003/09/28 16:37:23 nigelhorne |
306 | 306 |
* Added -f flag use MaxThreads if --max-children not set |
307 | 307 |
*/ |
308 |
-static char const rcsid[] = "$Id: clamav-milter.c,v 1.98 2004/06/22 04:09:12 nigelhorne Exp $"; |
|
308 |
+static char const rcsid[] = "$Id: clamav-milter.c,v 1.99 2004/06/28 08:30:18 nigelhorne Exp $"; |
|
309 | 309 |
|
310 |
-#define CM_VERSION "0.73c" |
|
310 |
+#define CM_VERSION "0.73d" |
|
311 | 311 |
|
312 | 312 |
/*#define CONFDIR "/usr/local/etc"*/ |
313 | 313 |
|
... | ... |
@@ -2672,7 +2675,7 @@ connect2clamd(struct privdata *privdata) |
2672 | 2672 |
sprintf(privdata->filename, "%s/%02d%02d%02d", quarantine_dir, |
2673 | 2673 |
YY, MM, DD); |
2674 | 2674 |
|
2675 |
- if(mkdir(privdata->filename, 0700) < 0) { |
|
2675 |
+ if((mkdir(privdata->filename, 0700) < 0) && (errno != EEXIST)) { |
|
2676 | 2676 |
perror(privdata->filename); |
2677 | 2677 |
if(use_syslog) |
2678 | 2678 |
syslog(LOG_ERR, "mkdir %s failed", privdata->filename); |