[debian-edu-commits] debian-edu/ 01/01: exim4 mainserver configuration: Allow Debian Edu clients on the default Debian Edu network to directly send mails to the main server (by white- listing the 10./8 network). This fixes console mailing and system mails on Debian Edu clients (Closes: #794602).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch jessie
in repository debian-edu-config.

commit 492e39335f1c1d7822bfcdd8d18160d67c0fbfbb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 14 12:15:18 2015 +0200

    exim4 mainserver configuration: Allow Debian Edu clients on the default Debian Edu network to directly send mails to the main server (by white- listing the 10./8 network). This fixes console mailing and system mails on Debian Edu clients (Closes: #794602).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
---
 debian/changelog                   | 4 ++++
 etc/exim4/exim-ldap-server-v4.conf | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10c869f..e1b4d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ debian-edu-config (1.818+deb8u1) UNRELEASED; urgency=low
     not, don't try to set the Kerberos password for this account. (Closes:
     #798435).
   * gosa-sync: Fix escaping double quotes and semicolons. (Closes: #794000).
+  * exim4 mainserver configuration: Allow Debian Edu clients on the default
+    Debian Edu network to directly send mails to the main server (by white-
+    listing the 10./8 network). This fixes console mailing and system mails
+    on Debian Edu clients (Closes: #794602).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 16 May 2015 23:12:06 +0200
 
diff --git a/etc/exim4/exim-ldap-server-v4.conf b/etc/exim4/exim-ldap-server-v4.conf
index 7b3fbc1..c2a2a3e 100644
--- a/etc/exim4/exim-ldap-server-v4.conf
+++ b/etc/exim4/exim-ldap-server-v4.conf
@@ -192,14 +192,15 @@ acl_check_rcpt:
   # Make sure users can not fake sender address vis SMTP.  Reject
   # unauthenticated connections and check that the sender is the same
   # as the Kerberos ID.
+  accept  hosts = :
+  accept  hosts = +relay_hosts
+
   deny  !authenticated = *
         message = SMTP server requires authentication. Check your SMTP client configuration.
   deny condition = ${if eq{$authenticated_id}{$sender_address_local_part at INTERN}{false}{true}}
         message = Sender address $sender_address conflicts with authentication $authenticated_id.
 
-  accept  hosts = :
   accept  domains = +local_domains
-  accept  hosts = +relay_hosts
   deny    message = relay not permitted
 
 # ACL that is used after the DATA command

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git