[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit e8f6878cd77664bb78ca08378abb842b7e1ce4bf
Author: aCaB <acab at clamav.net>
Date:   Thu Feb 4 22:19:28 2010 +0100

    bb#1789 - final

diff --git a/ChangeLog b/ChangeLog
index c287447..d5fe6da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb  4 22:17:49 CET 2010 (acab)
+-----------------------------------
+ * clamd: new options LocalSocketMode and LocalSocketGroup
+ * clamav-milter: new options MilterSocketMode and MilterSocketGroup
+   (bb#1789)
+
 Wed Feb  3 18:23:08 CET 2010 (tk)
 ---------------------------------
  * clamdscan: fix error logic once again
diff --git a/docs/man/clamd.conf.5.in b/docs/man/clamd.conf.5.in
index fd85210..e59626b 100644
--- a/docs/man/clamd.conf.5.in
+++ b/docs/man/clamd.conf.5.in
@@ -85,6 +85,16 @@ Default: @DBDIR@
 Path to a local (Unix) socket the daemon will listen on.
 .br 
 Default: no
+.TP
+\fLocalSocketGroup STRING
+Sets the group ownership on the unix socket.
+.br
+Default: the primary group of the user running clamd
+.TP
+\fLocalSocketMode STRING
+Sets the permissions on the unix socket to the specified mode.
+.br
+Default: socket is world readable and writable
 .TP 
 \fBFixStaleSocket BOOL\fR
 Remove stale socket after unclean shutdown.
diff --git a/etc/clamav-milter.conf b/etc/clamav-milter.conf
index 7d3b06c..9a71041 100644
--- a/etc/clamav-milter.conf
+++ b/etc/clamav-milter.conf
@@ -20,6 +20,14 @@ Example
 #MilterSocket /tmp/clamav-milter.socket
 #MilterSocket inet:7357
 
+# Define the group ownership for the (unix) milter socket.
+# Default: disabled (the primary group of the user running clamd)
+#MilterSocketGroup virusgroup
+
+# Sets the permissions on the (unix) milter socket to the specified mode.
+# Default: disabled (obey umask)
+#MilterSocketMode 660
+
 # Remove stale socket after unclean shutdown.
 #
 # Default: yes
diff --git a/etc/clamd.conf b/etc/clamd.conf
index e586d28..ccff749 100644
--- a/etc/clamd.conf
+++ b/etc/clamd.conf
@@ -73,7 +73,15 @@ Example
 
 # Path to a local socket file the daemon will listen on.
 # Default: disabled (must be specified by a user)
-LocalSocket /tmp/clamd.socket
+#LocalSocket /tmp/clamd.socket
+
+# Sets the group ownership on the unix socket.
+# Default: disabled (the primary group of the user running clamd)
+#LocalSocketGroup virusgroup
+
+# Sets the permissions on the unix socket to the specified mode.
+# Default: disabled (socket is world accessible)
+#LocalSocketMode 660
 
 # Remove stale socket after unclean shutdown.
 # Default: yes

-- 
Debian repository for ClamAV