@@ -46,6 +46,7 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"PidFile", OPT_STR},

 	    {"MaxFileSize", OPT_COMPSIZE},

 	    {"ScanMail", OPT_NOARG},

+	    {"ScanOLE2", OPT_NOARG},

 	    {"ScanArchive", OPT_NOARG},

 	    {"ScanRAR", OPT_NOARG},

 	    {"ArchiveMaxFileSize", OPT_COMPSIZE},

@@ -151,6 +151,13 @@ void *clamukoth(void *arg)

 	logg("Clamuko: Archive support disabled.\n");

     }

+    if(cfgopt(tharg->copt, "ScanOLE2")) { 

+	logg("Clamuko: OLE2 support enabled.\n");

+	options |= CL_OLE2;

+    } else {

+	logg("Clamuko: OLE2 support disabled.\n");

+    }

+

     if((pt = cfgopt(tharg->copt, "ClamukoMaxFileSize"))) {

 	sizelimit = pt->numarg;

     } else

@@ -191,6 +191,13 @@ int acceptloop_proc(int socketd, struct cl_node *root, const struct cfgstruct *c

 	logg("Mail support disabled.\n");

     }

+    if(cfgopt(copt, "ScanOLE2")) { 

+	logg("OLE2 support enabled.\n");

+	options |= CL_OLE2;

+    } else {

+	logg("OLE2 support disabled.\n");

+    }

+

     /* set up signal handling */

     sigfillset(&sigset);

@@ -39,6 +39,11 @@

 pthread_t clamukoid;

 #endif

+#ifdef TARGET_OS_DARWIN5_5

+#define	pthread_sigmask(A, B, C)    sigprocmask((A), (B), (C))

+#define	pthread_kill(A, B)	{ }

+#endif

+

 void *threadscanner(void *arg)

 {

@@ -398,9 +403,10 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     ths = (struct thrsession *) mcalloc(threads, sizeof(struct thrsession));

+    /*

     for(i = 0; i < threads; i++)

 	pthread_mutex_init(&ths[i].mutex, NULL);

-

+    */

     if(cfgopt(copt, "ScanArchive") || cfgopt(copt, "ClamukoScanArchive")) {

@@ -475,6 +481,13 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	logg("Mail files support disabled.\n");

     }

+    if(cfgopt(copt, "ScanOLE2")) { 

+	logg("OLE2 support enabled.\n");

+	options |= CL_OLE2;

+    } else {

+	logg("OLE2 support disabled.\n");

+    }

+

     /* initialize important global variables */

     progexit = 0;

     progpid = 0;