enable FixStaleSocket by default

git-svn: trunk@3272
18 years ago · e6fe106ee3
parent d22970ec44
commit e6fe106ee3
4 changed files with 7 additions and 3 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Sat Oct  6 00:25:17 CEST 2007 (tk)
+----------------------------------
+  * clamd: enable FixStaleSocket by default
+
 Fri Oct  5 22:56:13 CEST 2007 (tk)
 ----------------------------------
  * sigtool/sigtool.c: print filename when using --info (bb#513)
--- a/docs/man/clamd.conf.5.in
+++ b/docs/man/clamd.conf.5.in
@ -89,7 +89,7 @@ Default: no
 \fBFixStaleSocket BOOL\fR
 Remove stale socket after unclean shutdown.
 .br 
-Default: no
+Default: yes
 .TP 
 \fBTCPSocket NUMBER\fR
 TCP port number the daemon will listen on.
--- a/etc/clamd.conf
+++ b/etc/clamd.conf
@ -72,7 +72,7 @@ Example
 LocalSocket /tmp/clamd.socket

 # Remove stale socket after unclean shutdown.
-# Default: no
+# Default: yes
 #FixStaleSocket yes

 # TCP port address.
--- a/shared/cfgparser.c
+++ b/shared/cfgparser.c
@ -86,7 +86,7 @@ struct cfgoption cfg_options[] = {
    {"Foreground", OPT_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM},
    {"Debug", OPT_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM},
    {"LeaveTemporaryFiles", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},
-    {"FixStaleSocket", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},
+    {"FixStaleSocket", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
    {"User", OPT_QUOTESTR, -1, NULL, 0, OPT_CLAMD},
    {"AllowSupplementaryGroups", OPT_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM},
    {"SelfCheck", OPT_NUM, 1800, NULL, 0, OPT_CLAMD},