@@ -1,4 +1,11 @@

-Fri Feb 13 14:28:05 GMT 2004 (njh

+Fri Feb 13 22:35:55 CET 2004 (tk)

+---------------------------------

+  * Makefile: don't use non standard id flags (thanks to Andy Fiddaman

+	      <clam*fiddaman.net>)

+  * clamscan: manager.c - include clamav-config.h, it fixes a problem with

+	      hardcoded clamav user (thanks to Reinhard Max <max*suse.de>)

+

+Fri Feb 13 14:28:05 GMT 2004 (njh)

 ----------------------------------

   * libclamav: Added a new bounce delimeter

@@ -9,12 +16,12 @@ Thu Feb 12 18:47:44 GMT 2004 (njh)

 Wed Feb 11 18:00:13 CET 2004 (tk)

 ---------------------------------

   * libclamav: enabled autodetection of Eserv/2 mail files (thanks to

-	       Andrey Cherezov <andrey@cherezov.koenig.su>)

+	       Andrey Cherezov <andrey*cherezov.koenig.su>)

 Wed Feb 11 08:19:54 GMT 2004 (njh)

 ----------------------------------

   * libclamav: Use O_BINARY when saving attachments which is required for

-	Cygwin. Thanks to "Andrey Cherezov" <andrey@cherezov.koenig.su>

+	Cygwin. Thanks to "Andrey Cherezov" <andrey*cherezov.koenig.su>

 Wed Feb 11 00:08:26 CET 2004 (tk)

 ---------------------------------

@@ -19,6 +19,10 @@

  *  Wed Mar  5 03:45:31 CET 2003: included --move code from Damien Curtain

  */

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

@@ -28,7 +28,7 @@ install:

 	@test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)

 	@test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true

 	@test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true

-	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

+	@if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

 	    chmod 775 $(DESTDIR)$(DBINST); \

 	    chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \

 	    chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \

@@ -252,7 +252,7 @@ install:

 	@test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)

 	@test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true

 	@test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true

-	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

+	@if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

 	    chmod 775 $(DESTDIR)$(DBINST); \

 	    chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \

 	    chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \