steffen: server/kolabd/kolabd/templates main.cf.template.in, 1.5, 1.6 master.cf.template.in, 1.4, 1.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv25517/kolabd/templates

Modified Files:
	main.cf.template.in master.cf.template.in 
Log Message:
We have to move the kolabfilter before the virus-scanner to get at the sasl_user it seems

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.cf.template.in	13 Oct 2005 23:56:51 -0000	1.5
+++ main.cf.template.in	30 Nov 2005 01:19:04 -0000	1.6
@@ -147,15 +147,4 @@
 # Support broken clients like Microsoft Outlook Express 4.x which expect AUTH=LOGIN instead of AUTH LOGIN
 broken_sasl_auth_clients = yes
 
-@@@if postfix-enable-virus-scan@@@
-#
-# Amavis virus scan
-#
-
-content_filter=smtp-amavis:[127.0.0.1]:10024
-
-@@@else@@@
-
 content_filter=kolabfilter
-
-@@@endif@@@

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- master.cf.template.in	28 Nov 2005 04:16:01 -0000	1.4
+++ master.cf.template.in	30 Nov 2005 01:19:04 -0000	1.5
@@ -49,7 +49,11 @@
 # SMTP interface for injecting mail back into postfix
 # from amavis
 127.0.0.1:10025 inet n	-	n	-	-  smtpd
-    -o content_filter=kolabfilter
+@@@if postfix-enable-virus-scan@@@
+    -o content_filter=smtp-amavis:[127.0.0.1]:10024
+@@@else@@@
+    -o content_filter=
+@@@endif@@@
     -o cleanup_service_name=post-cleanup
     -o local_recipient_maps=
     -o relay_recipient_maps=