gunnar: server/kolabd/kolabd/templates master.cf.template.in, 1.23, 1.24

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	master.cf.template.in 
Log Message:
Update to the next experimental Kolab_Filter version.

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- master.cf.template.in	23 Sep 2008 10:38:09 -0000	1.23
+++ master.cf.template.in	23 Sep 2008 13:11:12 -0000	1.24
@@ -98,20 +98,20 @@
     -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabfilter 
     --
-    -h @@@fqdnhostname@@@
-    -s ${sender}
+    --host=@@@fqdnhostname@@@
+    --sender=${sender}
     --recipient=${recipient}
-    -c ${client_address}
-    -u ${sasl_username}
-    -C @resmgr_confdir@/kolabfilter.conf
+    --client=${client_address}
+    --user=${sasl_username}
+    --config=@resmgr_confdir@/kolabfilter.conf
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
     -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabmailboxfilter 
     --
-    -h @@@fqdnhostname@@@
-    -s ${sender}
+    --host=@@@fqdnhostname@@@
+    --sender=${sender}
     --recipient=${recipient}
-    -c ${client_address}
-    -C @resmgr_confdir@/kolabfilter.conf
+    --client=${client_address}
+    --config=@resmgr_confdir@/kolabfilter.conf