steffen: server/kolab/kolab kolab_bootstrap, 1.37, 1.38 kolab_smtpdpolicy, 1.8, 1.9

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv15052/kolab

Modified Files:
	kolab_bootstrap kolab_smtpdpolicy 
Log Message:
use domain for dc components. Disallow unauthenticated posting

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolab_bootstrap	21 Jun 2004 03:20:36 -0000	1.37
+++ kolab_bootstrap	29 Jun 2004 10:19:28 -0000	1.38
@@ -137,7 +137,7 @@
     print "Generating default configuration:\n";
     if ($base_dn =~ /\@\@\@/) {
       $base_dn = "";
-      foreach my $dc ((split(/\./,$fqdn))) {
+      foreach my $dc ((split(/\./,$domain))) {
 	$base_dn .= "dc=$dc,";
       }
       chop $base_dn;

Index: kolab_smtpdpolicy
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_smtpdpolicy,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab_smtpdpolicy	21 Jun 2004 03:20:36 -0000	1.8
+++ kolab_smtpdpolicy	29 Jun 2004 10:19:28 -0000	1.9
@@ -152,30 +152,28 @@
   # Check for allowed sender
  CHECKSENDER:
 
-  my $reg = '.*@('.join('|', at conf_domain).')';
-  if( $sender =~ /$reg/ ) {
-    my $mesg = $ldap->search( base=> $conf_basedn,
-			      scope=> 'sub', filter=> "(&(mail=$sender)(objectClass=kInetOrgPerson))");
-    if( !$mesg->code ) {
-      mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
-      foreach $ldapobject ($mesg->entries) {
-	mylog($syslog_priority, "Got object ".$ldapobject->get_value('uid') ) if $verbose;
-	if( $username eq $ldapobject->get_value('uid') || 
-	    contains( $username, @{$ldapobject->get_value('delegate', asref => 1 )})  ) {
-	  # All OK, user is sending as herself or as delegate
-	  mylog($syslog_priority, "$username using valid from address $sender") if $verbose;	
-	  goto CHECKDISTLIST;
-	}
+  my $mesg = $ldap->search( base=> $conf_basedn,
+			    scope=> 'sub', 
+			    filter=> "(&(objectClass=kInetOrgPerson)(|(mail=$sender)(alias=$sender)))");
+  if( !$mesg->code ) {
+    mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
+    foreach $ldapobject ($mesg->entries) {
+      mylog($syslog_priority, "Got object ".$ldapobject->get_value('uid') ) if $verbose;
+      if( $username && ($username eq $ldapobject->get_value('uid') || 
+	  contains( $username, @{$ldapobject->get_value('delegate', asref => 1 )}))  ) {
+	# All OK, user is sending as herself or as delegate
+	mylog($syslog_priority, "$username using valid from address $sender") if $verbose;	
+	goto CHECKDISTLIST;
       }
-    } else {
-      # LDAP error?
-      mylog($syslog_priority, "Query returned error: ".$mesg->error ) if $verbose;	
     }
-    # UPS, fake sender
-    mylog($syslog_priority, "Attempt to fake address $sender") if $verbose;	
-    return "REJECT Invalid sender";
+  } else {
+    # LDAP error?
+    mylog($syslog_priority, "Query returned error: ".$mesg->error ) if $verbose;	
   }
-
+  # UPS, fake sender
+  mylog($syslog_priority, "Attempt to fake address $sender") if $verbose;	
+  return "REJECT Invalid sender";
+  
   # Check for valid access to restricted distribution lists
  CHECKDISTLIST:
   if( !$username or $username eq '' ) {
@@ -190,7 +188,7 @@
 	mylog( $syslog_priority, "Attempt from $sender to access restricted list $recip" ) if $verbose;	
 	return "REJECT Access denied";
       } elsif( $mesg->code ) {
-	mylog( $syslog_priority, "LDAP Error: ".$mesg->error );
+	#mylog( $syslog_priority, "LDAP Error: ".$mesg->error );
       }
     }
   }