steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.8, 1.9

cvs at intevation.de cvs at intevation.de
Mon Nov 22 02:34:52 CET 2004


Author: steffen

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

Modified Files:
	kolabfilter.php 
Log Message:
logging

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolabfilter.php	21 Nov 2004 23:50:27 -0000	1.8
+++ kolabfilter.php	22 Nov 2004 01:34:50 -0000	1.9
@@ -47,7 +47,6 @@
 // From: header and that mail from the outside
 // does not impersonate any user from our domain
 function verify_sender( $sender, $from ) {
-  myLog("verify_sender( $sender, $from )", RM_LOG_DEBUG);
   global $params;
   if( is_array($params['email_domain']) ) {
     $domains = $params['email_domain'];
@@ -56,7 +55,6 @@
   }
   $senderdom = substr(strrchr($sender, '@'), 1);
   $fromdom = substr(strrchr($from, '@'), 1);
-  mylog( 'domains = "'.join( ', ', $domains ).'", '."senderdom=$senderdom, fromdom=$fromdom", RM_LOG_DEBUG); 
   foreach( $domains as $domain ) {
     if( ($senderdom == $domain ||
 	 $fromdom   == $domain ) &&
@@ -90,8 +88,8 @@
     $adrs = imap_rfc822_parse_adrlist($regs[1], $params['email_domain']);
     foreach( $adrs as $adr ) {
       $from = strtolower($adr->mailbox.'@'.$adr->host);
-      myLog("From: $from",RM_LOG_DEBUG);
       if( !verify_sender( $sender, $from) ) {
+	myLog("Invalid From: header. $from does not match envelope $sender\n", RM_LOG_DEBUG);
 	fwrite(STDOUT,"Invalid From: header. $from does not match envelope $sender\n");
 	exit(EX_UNAVAILABLE);
       }





More information about the commits mailing list