From 4fdc8b1798279f5cc0d005fd9629e704181e945e Mon Sep 17 00:00:00 2001 From: Martin Kamerbeek Date: Fri, 19 Nov 2010 13:11:42 +0100 Subject: [PATCH] Allow empty senderIp and default to 127.0.0.1. --- sbin/newsletter-transport.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sbin/newsletter-transport.pl b/sbin/newsletter-transport.pl index beedd33..db49696 100755 --- a/sbin/newsletter-transport.pl +++ b/sbin/newsletter-transport.pl @@ -34,11 +34,9 @@ my $webguiRoot = '/data/WebGUI'; my $session = openSession( $webguiRoot, $configFile ); no warnings 'once'; *{ WebGUI::Session::Env::getIp } = sub { - return $senderIp; + return $senderIp || '127.0.0.1'; }; - $session->log->warn( "IP is : [$senderIp][" .$session->env->getIp ."]"); - WebGUI::MailCommand::processCommand( $session, $command, $id, $sender ); closeSession( $session ); @@ -65,7 +63,7 @@ sub getCredentials { warn "--domain parameter is required" && exit( $WRONG_USAGE ) unless $domain; warn "--user parameter is required" && exit( $WRONG_USAGE ) unless $user; warn "--sender parameter is required" && exit( $WRONG_USAGE ) unless $sender; - warn "--senderIp parameter is required" && exit( $WRONG_USAGE ) unless $senderIp; + #warn "--senderIp parameter is required" && exit( $WRONG_USAGE ) unless $senderIp; my $dispatch = WebGUI::Config->new( $webguiRoot, 'mailing_dispatch.config' ) || warn "Cannot open $webguiRoot/etc/mailing_dispatch.config" && exit( $CONFIG_ERROR );