steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.28, 1.29

cvs at intevation.de cvs at intevation.de
Mon Oct 31 12:56:54 CET 2005


Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv20136

Modified Files:
	kolabfilter.php 
Log Message:
prepare for using sasl_username

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kolabfilter.php	12 Oct 2005 03:21:49 -0000	1.28
+++ kolabfilter.php	31 Oct 2005 11:56:52 -0000	1.29
@@ -101,7 +101,7 @@
 // Check that mail from our domains have trustable
 // From: header and that mail from the outside
 // does not impersonate any user from our domain
-function verify_sender( $sender, $from, $client_addr ) {
+function verify_sender( $sasluser, $sender, $from, $client_addr ) {
   global $params;
 
   // Allow anything from fellow Kolab-hosts
@@ -149,7 +149,7 @@
   return true;
 }
 
-$options = parse_args( array( 's', 'r', 'c', 'h' ), $_SERVER['argv']); //getopt("s:r:c:h:");
+$options = parse_args( array( 's', 'r', 'c', 'h', 'u' ), $_SERVER['argv']); //getopt("s:r:c:h:u:");
 
 if (!array_key_exists('r', $options) || !array_key_exists('s', $options)) {
     fwrite(STDOUT, "Usage is $argv[0] -s sender at domain -r recip at domain\n");
@@ -160,6 +160,7 @@
 $recipients = $options['r'];
 $client_address = $options['c'];
 $fqhostname = strtolower($options['h']);
+$sasl_username = strtolower($options['u']);
 
 // make sure recipients is an array
 if( !is_array($recipients) ) {
@@ -188,7 +189,7 @@
     // Done with headers
     $headers_done = true;
     if( $from && $params['verify_from_header'] ) {
-      if( !verify_sender( strtolower($sender), strtolower($from), $client_address) ) {
+      if( !verify_sender( $sasl_username, $sender, strtolower($from), $client_address) ) {
 		myLog("$sender and $from differ!", RM_LOG_DEBUG);
 		if( $params['reject_forged_from_header'] ) {
 		  // Always reject mismatches





More information about the commits mailing list