@@ -370,6 +370,15 @@ int main(int argc, char **argv)

             break;

         }

+        /* TODO: Re-enable OnAccessExtraScanning once the thread resource consumption issue is resolved. */

+        if(optget(opts, "OnAccessExtraScanning")->enabled) {

+            logg("^ScanOnAccess: OnAccessExtraScanning was requested, but has "

+                 "been disabled due to a known issue with thread resource "

+                 "cleanup. The OnAccessExtraScanning feature will be "

+                 "re-enabled in a future release when the issue is resolved. "

+                 "For details, see: https://bugzilla.clamav.net/show_bug.cgi?id=12048\n");

+        }

+

         if(!(engine = cl_engine_new())) {

             logg("!Can't initialize antivirus engine\n");

             ret = 1;

@@ -385,9 +385,12 @@ void *onas_ddd_th(void *arg) {

 		}

 	}

+	/* TODO: Re-enable OnAccessExtraScanning once the thread resource consumption issue is resolved. */

+#if 0

 	if(optget(tharg->opts, "OnAccessExtraScanning")->enabled) {

 		logg("ScanOnAccess: Extra scanning and notifications enabled.\n");

-	}

+}

+	#endif

 	FD_ZERO(&rfds);

@@ -476,6 +479,9 @@ static void onas_ddd_handle_in_create(struct ddd_thrarg *tharg,

 		const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask) {

 	struct stat s;

+

+	/* TODO: Re-enable OnAccessExtraScanning once the thread resource consumption issue is resolved. */

+#if 0

 	if (optget(tharg->opts, "OnAccessExtraScanning")->enabled) {

 		if(stat(child_path, &s) == 0 && S_ISREG(s.st_mode)) {

 			onas_ddd_handle_extra_scanning(tharg, child_path, ONAS_SCTH_ISFILE);

@@ -487,8 +493,10 @@ static void onas_ddd_handle_in_create(struct ddd_thrarg *tharg,

 			onas_ddd_handle_extra_scanning(tharg, child_path, ONAS_SCTH_ISDIR);

 		}

-	} else {

-

+	}

+	else

+#endif

+	{

 		if(stat(child_path, &s) == 0 && S_ISREG(s.st_mode)) return;

 		if(!(event->mask & IN_ISDIR)) return;

@@ -504,6 +512,8 @@ static void onas_ddd_handle_in_moved_to(struct ddd_thrarg *tharg,

 		const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask) {

 	struct stat s;

+	/* TODO: Re-enable OnAccessExtraScanning once the thread resource consumption issue is resolved. */

+#if 0

 	if (optget(tharg->opts, "OnAccessExtraScanning")->enabled) {

 		if(stat(child_path, &s) == 0 && S_ISREG(s.st_mode)) {

 			onas_ddd_handle_extra_scanning(tharg, child_path, ONAS_SCTH_ISFILE);

@@ -515,7 +525,10 @@ static void onas_ddd_handle_in_moved_to(struct ddd_thrarg *tharg,

 			onas_ddd_handle_extra_scanning(tharg, child_path, ONAS_SCTH_ISDIR);

 		}

-	} else {

+	}

+	else

+#endif

+	{

 		if(stat(child_path, &s) == 0 && S_ISREG(s.st_mode)) return;

 		if(!(event->mask & IN_ISDIR)) return;

@@ -252,9 +252,14 @@ void *onas_fan_th(void *arg)

 		if((check = onas_fan_checkowner(fmd->pid, tharg->opts))) {

 		    scan = 0;

-		    if (check != CHK_SELF || !(optget(tharg->opts, "OnAccessExtraScanning")->enabled)) {

-			logg("*ScanOnAccess: %s skipped (excluded UID)\n", fname);

-                    }

+	/* TODO: Re-enable OnAccessExtraScanning once the thread resource consumption issue is resolved. */

+	#if 0

+			if ((check != CHK_SELF) || !(optget(tharg->opts, "OnAccessExtraScanning")->enabled)) {

+	#else

+			if (check != CHK_SELF) {

+	#endif

+				logg("*ScanOnAccess: %s skipped (excluded UID)\n", fname);

+			}

 		}

 		if(sizelimit) {

@@ -672,6 +672,8 @@ Example

 # Toggles extra scanning and notifications when a file or directory is

 # created or moved.

 # Requires the  DDD system to kick-off extra scans.

+# NOTE:  This feature is disabled until a thread resource leak bug

+#        in the OnAccessExtraScanning code can be resolved.

 # (On-access scan only)

 # Default: no

 #OnAccessExtraScanning yes