steffen: server/kolabd/kolabd kolab.globals, 1.2, 1.3 kolab_smtpdpolicy.in, 1.10, 1.11 kolabd.spec.in, 1.5, 1.6

cvs at kolab.org cvs at kolab.org
Wed Mar 28 03:51:37 CEST 2007


Author: steffen

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

Modified Files:
	kolab.globals kolab_smtpdpolicy.in kolabd.spec.in 
Log Message:
make kolab_policy accept any sender from the outside if internet email is enabled (issue954)

Index: kolab.globals
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.globals	20 Apr 2005 22:13:32 -0000	1.2
+++ kolab.globals	28 Mar 2007 01:51:35 -0000	1.3
@@ -10,6 +10,7 @@
 gyard_deletion_period : 10080
 ldap_uri : ldap://127.0.0.1:389
 log_level : 2
+debug : 0
 postfix-mydestination : $mydomain
 proftpd-ftp : FALSE
 proftpd-userPassword :

Index: kolab_smtpdpolicy.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab_smtpdpolicy.in	27 Mar 2007 13:32:54 -0000	1.10
+++ kolab_smtpdpolicy.in	28 Mar 2007 01:51:35 -0000	1.11
@@ -277,7 +277,8 @@
 
   # First check if the sender is a privileged kolabhost
   # Kolab hosts use un-authenticated smtp currently
-  return "DUNNO" if( !$username && check_permithosts($client_addr) );
+  # We also just accept the email here is conf_allowunauth is set
+  return "DUNNO" if( !$username && ( $conf_allowunauth || check_permithosts($client_addr) ) );
 
   # Reject anything else from unauthenticated users
   # if conf_allowunauth is false

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabd.spec.in	17 Feb 2007 16:32:35 -0000	1.5
+++ kolabd.spec.in	28 Mar 2007 01:51:35 -0000	1.6
@@ -53,10 +53,9 @@
 PreReq:       OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.23-2.3.0_kolab2, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
 PreReq:       sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes
 PreReq:       proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes
-PreReq:       gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes
 PreReq:       postfix >= 2.1.5-2.2.0_kolab3, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
 PreReq:       imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes
-PreReq:       apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
+PreReq:       apache >= 1.3.31-2.2.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
 PreReq:       perl-kolab >= 5.8.7-20050728, perl-db
 PreReq:	      amavisd >= 2.3.1-2.4.0
 PreReq:	      clamav >= 0.90-20070214





More information about the commits mailing list