Accepting request 148449 from home:m_meister:branches:security

- pids and sockets of clamd and freshclam now reside in /var/run
  instead of /var/lib (bnc#770395)
- modified pid path in clamd's, freshclam's and clamav-milter's
  init scripts

OBS-URL: https://build.opensuse.org/request/show/148449
OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=73
This commit is contained in:
2013-01-14 15:06:55 +00:00
committed by Git OBS Bridge
parent d8cb99a265
commit a7d93681e5
7 changed files with 51 additions and 12 deletions

View File

@@ -19,7 +19,7 @@ Index: etc/clamav-milter.conf
# Default: no default
-#MilterSocket /tmp/clamav-milter.socket
-#MilterSocket inet:7357
+MilterSocket /var/lib/clamav/clamav-milter-socket
+MilterSocket /var/run/clamav/clamav-milter-socket
# Define the group ownership for the (unix) milter socket.
# Default: disabled (the primary group of the user running clamd)
@@ -37,7 +37,7 @@ Index: etc/clamav-milter.conf
#
# Default: disabled
-#PidFile /var/run/clamav-milter.pid
+PidFile /var/lib/clamav/clamav-milter.pid
+PidFile /var/run/clamav/clamav-milter.pid
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -46,7 +46,7 @@ Index: etc/clamav-milter.conf
#
# Default: no default
-#ClamdSocket tcp:scanner.mydomain:7357
+ClamdSocket unix:/var/lib/clamav/clamd-socket
+ClamdSocket unix:/var/run/clamav/clamd-socket
##
@@ -104,7 +104,7 @@ Index: etc/clamd.conf
# daemon (main thread).
# Default: disabled
-#PidFile /var/run/clamd.pid
+PidFile /var/lib/clamav/clamd.pid
+PidFile /var/run/clamav/clamd.pid
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -113,7 +113,7 @@ Index: etc/clamd.conf
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
-#LocalSocket /tmp/clamd.socket
+LocalSocket /var/lib/clamav/clamd-socket
+LocalSocket /var/run/clamav/clamd-socket
# Sets the group ownership on the unix socket.
# Default: disabled (the primary group of the user running clamd)
@@ -188,7 +188,7 @@ Index: etc/freshclam.conf
# This option allows you to save the process identifier of the daemon
# Default: disabled
-#PidFile /var/run/freshclam.pid
+PidFile /var/lib/clamav/freshclam.pid
+PidFile /var/run/clamav/freshclam.pid
# By default when started freshclam drops privileges and switches to the
# "clamav" user. This directive allows you to change the database owner.