diff -ru -I Id: -x CVS -N dbmail/Makefile.mysql dbmail.working/Makefile.mysql
--- dbmail/Makefile.mysql	2002-11-13 11:21:07.000000000 +1300
+++ dbmail.working/Makefile.mysql	2002-11-12 10:01:12.000000000 +1300
@@ -10,27 +10,34 @@
 MSGBUFOBJECT = $(DBASETYPE)/dbmsgbuf$(DBASETYPE).o
 SEARCHOBJECT = $(DBASETYPE)/dbsearch$(DBASETYPE).o
 DBOBJECT = $(DBASETYPE)/db$(DBASETYPE).o
+CHECKOBJECT = check.o rfc822.o
 
 SMTP_OBJECTS = list.o debug.o pipe.o mime.o $(DBOBJECT) dbmd5.o md5.o bounce.o forward.o memblock.o \
-$(AUTHOBJECT)
-INJECTOR_OBJECTS = list.o debug.o $(DBOBJECT) dbmd5.o md5.o $(AUTHOBJECT) mime.o
-UNIONE_OBJECTS = list.o debug.o $(DBOBJECT) dbmd5.o md5.o $(AUTHOBJECT) mime.o
-MINI_OBJECTS = debug.o $(DBOBJECT) list.o dbmd5.o md5.o $(AUTHOBJECT) mime.o
-POP_OBJECTS = pop3.o list.o debug.o $(DBOBJECT) dbmd5.o md5.o mime.o misc.o memblock.o $(AUTHOBJECT)
+$(AUTHOBJECT) config.o hash.o $(CHECKOBJECT)
+INJECTOR_OBJECTS = list.o debug.o $(DBOBJECT) dbmd5.o md5.o $(AUTHOBJECT) mime.o config.o hash.o $(CHECKOBJECT)
+UNIONE_OBJECTS = list.o debug.o $(DBOBJECT) dbmd5.o md5.o $(AUTHOBJECT) mime.o config.o hash.o $(CHECKOBJECT)
+MINI_OBJECTS = debug.o $(DBOBJECT) list.o dbmd5.o md5.o $(AUTHOBJECT) mime.o config.o hash.o $(CHECKOBJECT)
+POP_OBJECTS = pop3.o list.o debug.o $(DBOBJECT) dbmd5.o md5.o mime.o misc.o memblock.o $(AUTHOBJECT) \
+config.o hash.o $(CHECKOBJECT) proctitleutils.o
 IMAP_OBJECTS = imap4.o debug.o $(DBOBJECT) serverservice.o list.o dbmd5.o md5.o imaputil.o \
-imapcommands.o mime.o misc.o memblock.o rfcmsg.o $(MSGBUFOBJECT) $(SEARCHOBJECT) $(AUTHOBJECT)
+imapcommands.o mime.o misc.o memblock.o rfcmsg.o $(MSGBUFOBJECT) $(SEARCHOBJECT) $(AUTHOBJECT) \
+config.o hash.o  $(CHECKOBJECT) proctitleutils.o
 REALSMTP_OBJECTS = smtp.o debug.o dbmd5.o md5.o list.o mime.o serverservice.o misc.o \
-smtpcommands.o memblock.o $(DBOBJECT) $(AUTHOBJECT)
-MAINTENANCE_OBJECTS = debug.o list.o dbmd5.o md5.o $(DBOBJECT) mime.o memblock.o $(AUTHOBJECT)
-CONFIG_OBJECTS = $(DBOBJECT) list.o md5.o debug.o dbmd5.o mime.o memblock.o $(AUTHOBJECT)
-USER_OBJECTS = debug.o list.o dbmd5.o md5.o $(DBOBJECT) mime.o memblock.o $(AUTHOBJECT)
-VUTCONV_OBJECTS = debug.o list.o dbmd5.o md5.o mime.o $(DBOBJECT) $(AUTHOBJECT)
+smtpcommands.o memblock.o $(DBOBJECT) $(AUTHOBJECT) config.o hash.o $(CHECKOBJECT)
+MAINTENANCE_OBJECTS = debug.o list.o dbmd5.o md5.o $(DBOBJECT) mime.o memblock.o $(AUTHOBJECT) \
+config.o hash.o $(CHECKOBJECT)
+CONFIG_OBJECTS = $(DBOBJECT) list.o md5.o debug.o dbmd5.o mime.o memblock.o $(AUTHOBJECT) \
+config.o hash.o $(CHECKOBJECT)
+USER_OBJECTS = debug.o list.o dbmd5.o md5.o $(DBOBJECT) mime.o memblock.o $(AUTHOBJECT) \
+config.o hash.o $(CHECKOBJECT)
+VUTCONV_OBJECTS = debug.o list.o dbmd5.o md5.o mime.o $(DBOBJECT) $(AUTHOBJECT) \
+config.o hash.o $(CHECKOBJECT)
 CC = cc
 
 MYSQLLIBDIR=/usr/local/lib/mysql
 
 LIBS = -L$(MYSQLLIBDIR)
-LIB = -lmysqlclient -lcrypt
+LIB = -lmysqlclient -lcrypt -lc -lz
 
 # Added the -D_BSD_SOURCE option to suppress warnings
 # from compiler about vsyslog function 
@@ -40,7 +47,7 @@
 
 .PHONY: clean install
 
-all: smtp pop3d maintenance config imapd user readvut mbox2dbmail injector miniinjector unione raw
+all: smtp pop3d maintenance config imapd user readvut mbox2dbmail injector miniinjector unione mboxfast raw
 
 smtp: config.h main.h $(SMTP_OBJECTS) main.c
 		$(CC)	$(CFLAGS) main.c -o dbmail-smtp $(SMTP_OBJECTS) $(LIBS) $(LIB)
@@ -72,6 +79,9 @@
 unione: db.h auth.h $(INJECTOR_OBJECTS) uni-one-convert.c
 	$(CC) $(CFLAGS) uni-one-convert.c -o uni-one-convertor $(UNIONE_OBJECTS) $(LIBS) $(LIB)
 
+mboxfast: db.h auth.h $(INJECTOR_OBJECTS) mbox2dbmail-fast.c
+	$(CC) $(CFLAGS) mbox2dbmail-fast.c -o mbox2dbmail-fast $(UNIONE_OBJECTS) $(LIBS) $(LIB)
+
 raw: db.h auth.h $(INJECTOR_OBJECTS) raw-convert.c
 	$(CC) $(CFLAGS) raw-convert.c -o raw-convertor $(UNIONE_OBJECTS) $(LIBS) $(LIB)
 
@@ -84,9 +94,9 @@
 debug.o: debug.h
 pipe.o: pipe.h config.h debug.h
 forward.o: forward.h config.h debug.h
-mime.o: mime.h config.h debug.h
+mime.o: mime.h config.h debug.h check.h
 misc.o:misc.h config.h debug.h
-pop3.o:pop3.h config.h debug.h dbmailtypes.h
+pop3.o:pop3.h config.h debug.h dbmailtypes.h proctitleutils.h
 dbmd5.o:dbmd5.h md5.h debug.h
 bounce.o:bounce.h list.h debug.h
 imap4.o: imap4.h db.h debug.h serverservice.h imaputil.h imapcommands.h
@@ -94,20 +104,27 @@
 imapcommands.o: imapcommands.h imaputil.h imap4.h db.h memblock.h debug.h dbmailtypes.h
 smtp.o: smtp.h db.h debug.h serverservice.h smtpcommands.h memblock.h
 smtpcommands.o: smtpcommands.h db.h debug.h dbmailtypes.h memblock.h
-serverservice.o: serverservice.h debug.h
+serverservice.o: serverservice.h debug.h proctitleutils.h
 maintenance.o: maintenance.h debug.h
 settings.o: settings.h debug.h
 user.o: user.h debug.h
 memblock.o: memblock.h debug.h
 rfcmsg.o: rfcmsg.h dbmailtypes.h
 vut2dbmail.o: db.h auth.h
+config.o: config.h db.h debug.h hash.h
+hash.o: hash.h
+rfc822.o: rfc822.h
+check.o: check.h rfc822.h
+proctitleutils.o:  proctitleutils.h
 $(DBOBJECT):db.h dbmd5.h config.h mime.h list.h memblock.h debug.h dbmailtypes.h auth.h
 $(MSGBUFOBJECT): dbmsgbuf.h db.h
 $(SEARCHOBJECT): dbsearch.h db.h
-$(AUTHOBJECT): auth.h db.h
+$(AUTHOBJECT): config.h auth.h db.h
 
 distclean: clean
-	rm -rf dbmail-smtp dbmail-pop3d dbmail-maintenance dbmail-imapd dbmail-config dbmail-adduser dbmail-readvut mbox2dbmail dbmail-realsmtp
+	rm -rf dbmail-smtp dbmail-pop3d dbmail-maintenance dbmail-imapd dbmail-config \
+	dbmail-adduser dbmail-readvut mbox2dbmail dbmail-realsmtp dbmail-mini-injector \
+	dbmail-smtp-injector raw-convertor uni-one-convertor mbox2dbmail-fast
 
 clean:
 	rm -f *.o core $(DBASETYPE)/*.o