cf98e1a
--- clamav-0.98.5/etc/clamd.conf.sample		2014-05-06 20:39:56.000000000 +0200
cf98e1a
+++ clamav-0.98.5/etc/clamd.conf.sample.jitoff	2014-05-10 22:20:49.000000000 +0200
07c7f28
@@ -564,6 +564,16 @@
Enrico Scholz e23ab1c
 # Default: yes
Enrico Scholz e23ab1c
 #Bytecode yes
Enrico Scholz e23ab1c
 
Enrico Scholz e23ab1c
+# Bytecode mode
Enrico Scholz e23ab1c
+#
Enrico Scholz e23ab1c
+# This option has been set to 'ForceInterpreter' in Fedora due to
Enrico Scholz e23ab1c
+# security concerns by default.  You might need to enable the
Enrico Scholz e23ab1c
+# 'clamd_use_jit' SELinux boolean after setting this option to the
Enrico Scholz e23ab1c
+# more efficient 'ForceJIT' value.
Enrico Scholz e23ab1c
+#
Enrico Scholz e23ab1c
+# Default: ForceInterpreter
Enrico Scholz e23ab1c
+#ByteCodeMode ForceInterpreter
Enrico Scholz e23ab1c
+
Enrico Scholz e23ab1c
 # Set bytecode security level.
Enrico Scholz e23ab1c
 # Possible values:
Enrico Scholz e23ab1c
 #       None - no security at all, meant for debugging. DO NOT USE THIS ON PRODUCTION SYSTEMS
cf98e1a
--- clamav-0.98.5/shared/optparser.c		2014-11-19 11:46:47.080668301 +0100
cf98e1a
+++ clamav-0.98.5/shared/optparser.c.jitoff	2014-11-19 11:47:32.709306659 +0100
cf98e1a
@@ -294,7 +294,7 @@
cf98e1a
     { "BytecodeUnsigned", "bytecode-unsigned", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, 
57cb746
 	"Allow loading bytecode from outside digitally signed .c[lv]d files.","no"},
Enrico Scholz 2b2f955
 
cf98e1a
-    { "BytecodeMode", "bytecode-mode", 0, CLOPT_TYPE_STRING, "^(Auto|ForceJIT|ForceInterpreter|Test)$", -1, "Auto", FLAG_REQUIRED, OPT_CLAMD | OPT_CLAMSCAN,
cf98e1a
+    { "BytecodeMode", "bytecode-mode", 0, CLOPT_TYPE_STRING, "^(Auto|ForceJIT|ForceInterpreter|Test)$", -1, "ForceInterpreter", FLAG_REQUIRED, OPT_CLAMD | OPT_CLAMSCAN,
57cb746
 	"Set bytecode execution mode.\nPossible values:\n\tAuto - automatically choose JIT if possible, fallback to interpreter\nForceJIT - always choose JIT, fail if not possible\nForceIntepreter - always choose interpreter\nTest - run with both JIT and interpreter and compare results. Make all failures fatal.","Auto"},
Enrico Scholz e23ab1c
 
cf98e1a
     { "BytecodeStatistics", "bytecode-statistics", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN | OPT_CLAMBC, "Collect and print bytecode execution statistics.", "no" },