steffen: server/kolabd/kolabd/templates main.cf.template, 1.15.2.3, 1.15.2.4

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	main.cf.template 
Log Message:
Fix for issue942 -- had to partially revert the prev. fix and do a workaround instead to keep compatibility

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/main.cf.template,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -d -r1.15.2.3 -r1.15.2.4
--- main.cf.template	3 Oct 2005 01:16:43 -0000	1.15.2.3
+++ main.cf.template	12 Oct 2005 11:04:16 -0000	1.15.2.4
@@ -28,7 +28,7 @@
 myhostname = @@@fqdnhostname@@@
 mydomain = @@@postfix-mydomain@@@
 myorigin = $mydomain
-relayhost = [@@@postfix-relayhost@@@]:@@@postfix-relayport@@@
+relayhost = @@@postfix-relayhost@@@
 
 # 
 masquerade_domains = $mydomain