bernhard: server/kolabd/kolabd/templates main.cf.template.in, 1.6, 1.7 master.cf.template.in, 1.6, 1.7

[cvs at intevation.de]

Author: bernhard

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

Modified Files:
	main.cf.template.in master.cf.template.in 
Log Message:
Fix for issue968(Postfix logs password for ssl port 465).
	* Removed "-v" option from smtpd on port 465.
	* Added smtpd_tls_loglevel = 1 so that TLS connects are logged.


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- main.cf.template.in	30 Nov 2005 01:19:04 -0000	1.6
+++ main.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
@@ -95,7 +95,7 @@
 #smtpd_tls_dkey_file = $smtpd_tls_dcert_file
 #smtpd_tls_key_file = $smtpd_tls_cert_file
 smtpd_tls_key_file = @sysconfdir@/kolab/key.pem
-#smtpd_tls_loglevel = 3
+smtpd_tls_loglevel = 1
 smtpd_tls_received_header = no
 #smtpd_tls_req_ccert = no
 #smtpd_tls_session_cache_database =

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- master.cf.template.in	30 Nov 2005 02:42:03 -0000	1.6
+++ master.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
@@ -39,8 +39,7 @@
 #uucp     unix  -       n       n       -       -       pipe flags=Fqhu user=uucp argv=@bindir@/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient)
 #bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=@bindir@/bsmtp -f $sender $nexthop $recipient
-465       inet  n       -       n       -       -       smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
-#587      inet  n       -       n       -       -       smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+465       inet  n       -       n       -       -       smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
 post-cleanup unix  n    -       n       -       0       cleanup -o virtual_maps=
 smtp-amavis unix -	-	n	-	2       smtp
     -o smtp_data_done_timeout=1200