steffen: server/kolabd/kolabd kolab_smtpdpolicy,1.5,1.6

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab_smtpdpolicy 
Log Message:
Issue608 (skip permithosts check for authenticated connections)

Index: kolab_smtpdpolicy
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab_smtpdpolicy	17 Jan 2005 01:45:03 -0000	1.5
+++ kolab_smtpdpolicy	21 Feb 2005 13:25:28 -0000	1.6
@@ -155,14 +155,17 @@
 
  CHECKPERMITHOSTS:
   # First check if the sender is a privileged kolabhost
-  for my $host (@conf_permithosts) {
-    unless ($h = gethost($host)) {
-      mylog($syslog_priority,"No such host $host\n");
-      next;
-    }
-    for my $addr ( @{$h->addr_list} ) {
-      return "DUNNO" if inet_ntoa($addr) eq $client_addr;
-    }
+  # Kolab hosts use un-authenticated smtp currently
+  if( !$username ) {
+      for my $host (@conf_permithosts) {
+	  unless ($h = gethost($host)) {
+	      mylog($syslog_priority,"No such host $host\n");
+	      next;
+	  }
+	  for my $addr ( @{$h->addr_list} ) {
+	      return "DUNNO" if inet_ntoa($addr) eq $client_addr;
+	  }
+      }
   }
 
   # Translate uid to mail: