removed UseProcesses

git-svn: trunk@264

clamav-devel/AUTHORS

@@ -17,6 +17,10 @@ submission mechanism)
 Trog <trog*clamav.net>
 OLE2 and VBA decoders.
 
+Thomas Lamy <tlamy*clamav.net>
+gpg key   : http://www.clamav.net/gpg/tlamy.gpg
+Random hacker.
+
 Submission management interface (for database developers only): Diego d'Ambra
 <diego*clamav.net>, Thomas Madsen <tm*softcom.dk>
 

clamav-devel/ChangeLog

@@ -1,3 +1,7 @@
+Tue Feb 10 14:35:07 CET 2004 (tk)
+---------------------------------
+  * clamd: UseProcesses - permanently removed
+
 Tue Feb 10 10:38:08 GMT 2004 (trog)
 -----------------------------------
   * libclamav/ole2_extract.c: Improve error handling

clamav-devel/clamd/Makefile.am

@@ -32,7 +32,6 @@ clamd_SOURCES = \
     localserver.h \
     session.c \
     session.h \
-    server-proc.c \
     server-th.c \
     server.h \
     scanner.c \

clamav-devel/clamd/Makefile.in

@@ -130,7 +130,6 @@ install_sh = @install_sh@
 @BUILD_CLAMD_TRUE@    localserver.h \
 @BUILD_CLAMD_TRUE@    session.c \
 @BUILD_CLAMD_TRUE@    session.h \
-@BUILD_CLAMD_TRUE@    server-proc.c \
 @BUILD_CLAMD_TRUE@    server-th.c \
 @BUILD_CLAMD_TRUE@    server.h \
 @BUILD_CLAMD_TRUE@    scanner.c \
@@ -162,10 +161,9 @@ PROGRAMS = $(sbin_PROGRAMS)
 @BUILD_CLAMD_TRUE@am_clamd_OBJECTS = options.$(OBJEXT) cfgfile.$(OBJEXT) \
 @BUILD_CLAMD_TRUE@	clamd.$(OBJEXT) tcpserver.$(OBJEXT) \
 @BUILD_CLAMD_TRUE@	localserver.$(OBJEXT) session.$(OBJEXT) \
-@BUILD_CLAMD_TRUE@	server-proc.$(OBJEXT) server-th.$(OBJEXT) \
-@BUILD_CLAMD_TRUE@	scanner.$(OBJEXT) others.$(OBJEXT) \
-@BUILD_CLAMD_TRUE@	clamuko.$(OBJEXT) dazukoio.$(OBJEXT) \
-@BUILD_CLAMD_TRUE@	tests.$(OBJEXT)
+@BUILD_CLAMD_TRUE@	server-th.$(OBJEXT) scanner.$(OBJEXT) \
+@BUILD_CLAMD_TRUE@	others.$(OBJEXT) clamuko.$(OBJEXT) \
+@BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT) tests.$(OBJEXT)
 clamd_OBJECTS = $(am_clamd_OBJECTS)
 @BUILD_CLAMD_TRUE@clamd_DEPENDENCIES = ../clamscan/getopt.o
 @BUILD_CLAMD_FALSE@clamd_DEPENDENCIES =
@@ -179,9 +177,8 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/clamuko.Po ./$(DEPDIR)/dazukoio.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/localserver.Po ./$(DEPDIR)/options.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/others.Po ./$(DEPDIR)/scanner.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/server-proc.Po ./$(DEPDIR)/server-th.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/session.Po ./$(DEPDIR)/tcpserver.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tests.Po
+@AMDEP_TRUE@	./$(DEPDIR)/server-th.Po ./$(DEPDIR)/session.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/tcpserver.Po ./$(DEPDIR)/tests.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -248,7 +245,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server-proc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server-th.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcpserver.Po@am__quote@

clamav-devel/clamd/cfgfile.c

@@ -67,7 +67,6 @@ struct cfgstruct *parsecfg(const char *cfgfile)
 	    {"MaxConnectionQueueLength", OPT_NUM},
 	    {"StreamSaveToDisk", OPT_NOARG},
 	    {"StreamMaxLength", OPT_COMPSIZE},
-	    {"UseProcesses", OPT_NOARG},
 	    {"MaxThreads", OPT_NUM},
 	    {"ThreadTimeout", OPT_NUM},
 	    {"MaxDirectoryRecursion", OPT_NUM},

clamav-devel/clamd/localserver.c

@@ -100,11 +100,7 @@ int localserver(const struct optstruct *opt, const struct cfgstruct *copt, struc
 	exit(1);
     }
 
-    /*
-    if(cfgopt(copt, "UseProcesses"))
-	acceptloop_proc(sockfd, root, copt);
-    else */
-	acceptloop_th(sockfd, root, copt);
+    acceptloop_th(sockfd, root, copt);
 
     return 0;
 }