Phil.
Index: clamav-milter/Makefile.am
===================================================================
RCS file: /cvsroot/clamav/clamav-devel/clamav-milter/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- clamav-milter/Makefile.am 30 Mar 2004 21:11:25 -0000 1.13
+++ clamav-milter/Makefile.am 31 Mar 2004 02:16:13 -0000
@@ -21,12 +21,14 @@
sbin_PROGRAMS = clamav-milter
-clamav_milter_SOURCES =
- $(top_srcdir)/shared/cfgparser.c \
- $(top_srcdir)/shared/cfgparser.h \
- $(top_srcdir)/shared/getopt.c \
- $(top_srcdir)/shared/getopt.h \
- clamav-milter.c
+clamav_milter_SOURCES = \
+ $(top_srcdir)/shared/cfgparser.c \
+ $(top_srcdir)/shared/cfgparser.h \
+ $(top_srcdir)/shared/getopt.c \
+ $(top_srcdir)/shared/getopt.h \
+ $(top_srcdir)/shared/memory.c \
+ $(top_srcdir)/shared/memory.h \
+ clamav-milter.c
man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
Index: clamav-milter/clamav-milter.c
===================================================================
RCS file: /cvsroot/clamav/clamav-devel/clamav-milter/clamav-milter.c,v
retrieving revision 1.65
diff -u -r1.65 clamav-milter.c
--- clamav-milter/clamav-milter.c 27 Mar 2004 21:44:21 -0000 1.65
+++ clamav-milter/clamav-milter.c 31 Mar 2004 02:16:27 -0000
@@ -493,7 +493,8 @@
#endif
#include "defaults.h"
-#include "cfgfile.h"
+#include "cfgparser.h"
+#include "memory.h"
#include "../target.h"
#include "str.h"
#include "../libclamav/others.h"
@@ -513,15 +514,15 @@
#include <string.h>
#include <sys/wait.h>
#include <assert.h>
-#include <arpa/inet.h>
#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include <sys/un.h>
#include <stdarg.h>
#include <errno.h>
#include <libmilter/mfapi.h>
#include <pthread.h>
#include <sys/time.h>
-#include <netinet/in.h>
#include <signal.h>
#include <regex.h>
#include <fcntl.h>
Index: clamdscan/clamdscan.c
===================================================================
RCS file: /cvsroot/clamav/clamav-devel/clamdscan/clamdscan.c,v
retrieving revision 1.9
diff -u -r1.9 clamdscan.c
--- clamdscan/clamdscan.c 30 Mar 2004 21:11:25 -0000 1.9
+++ clamdscan/clamdscan.c 31 Mar 2004 02:16:46 -0000
@@ -36,6 +36,9 @@
void help(void);
+struct s_info claminfo;
+short printinfected = 0;
+
void clamscan(struct optstruct *opt)
{
int ds, dms, ret;
