--- clamd.initd-r3      2013-03-01 12:18:17.000000000 +0400
+++ /root/clamd.initd-r5        2013-08-21 15:48:04.000000000 +0400
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r3,v 1.1 2013/03/01 08:18:17 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r5,v 1.2 2013/04/16 05:52:39 eras Exp $

 daemon_clamd="/usr/sbin/clamd"
 daemon_freshclam="/usr/bin/freshclam"
@@ -30,15 +30,10 @@
 }

 start() {
-       local clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
-       local clamd_user=$(get_config clamd User clamav)
-       local freshclam_user=$(get_config freshclam DatabaseOwner clamav)
+       # populate variables and fix log file and socket permissions
        logfix

        if [ "${START_CLAMD}" = "yes" ]; then
-               checkpath --quiet --mode 755 \
-                       --owner "${clamd_user}":"${clamd_user}" \
-                       --directory `dirname ${clamd_socket}`
                if [ -S "${clamd_socket}" ]; then
                        rm -f ${clamd_socket}
                fi
@@ -95,10 +90,15 @@
 }

 logfix() {
+       clamd_socket=$(get_config clamd LocalSocket /run/clamav/clamd.sock)
        if [ "${START_CLAMD}" = "yes" ]; then
                # fix clamd log permissions
                # (might be clobbered by logrotate or something)
+               local clamd_user=$(get_config clamd User clamav)
                local logfile=$(get_config clamd LogFile)
+               checkpath --quiet --mode 755 \
+                       --owner "${clamd_user}":"${clamd_user}" \
+                       --directory `dirname ${clamd_socket}`
                if [ -n "${logfile}" ]; then
                        checkpath --quiet \
                                --owner "${clamd_user}":"${clamd_user}" \
@@ -111,6 +111,10 @@
                # fix freshclam log permissions
                # (might be clobbered by logrotate or something)
                local logfile=$(get_config freshclam UpdateLogFile)
+               local freshclam_user=$(get_config freshclam DatabaseOwner clamav)
+               checkpath --quiet --mode 755 \
+                       --owner "${clamd_user}":"${clamd_user}" \
+                       --directory `dirname ${clamd_socket}`
                if [ -n "${logfile}" ]; then
                        checkpath --quiet \
                                --owner "${freshclam_user}":"${freshclam_user}" \