Mailinglist Archive: yast-commit (819 mails)

< Previous Next >
[yast-commit] r54520 - /trunk/mail/src/YaPI/MailServer.pm
  • From: varkoly@xxxxxxxxxxxxxxxx
  • Date: Fri, 09 Jan 2009 15:57:13 -0000
  • Message-id: <E1LLJjV-0002mL-Pi@xxxxxxxxxxxxxxxx>
Author: varkoly
Date: Fri Jan 9 16:57:13 2009
New Revision: 54520

URL: http://svn.opensuse.org/viewcvs/yast?rev=54520&view=rev
Log:
set the mydomain variable too

Modified:
trunk/mail/src/YaPI/MailServer.pm

Modified: trunk/mail/src/YaPI/MailServer.pm
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=54520&r1=54519&r2=54520&view=diff
==============================================================================
--- trunk/mail/src/YaPI/MailServer.pm (original)
+++ trunk/mail/src/YaPI/MailServer.pm Fri Jan 9 16:57:13 2009
@@ -1189,15 +1189,15 @@
foreach ( @ACONF )
{
s/\s+//g;
- if ( /^\$max_servers=(\d+)/ )
- {
- $MailPrevention{'VSCount'} = YaST::YCP::Integer($1);
- }
- $ismax = 1;
+ if ( /^\$max_servers=(\d+)/ )
+ {
+ $MailPrevention{'VSCount'} = YaST::YCP::Integer($1);
+ }
+ $ismax = 1;
}
if( !$ismax )
{
- $MailPrevention{'VSCount'} = YaST::YCP::Integer(5);
+ $MailPrevention{'VSCount'} = YaST::YCP::Integer(2);
}
}
# make IMAP connection
@@ -2963,20 +2963,24 @@
my $ismax = 0;
my $ismyhostname = 0;
my $myhostname = `hostname -f`; chomp $myhostname;
+ my $mydomain = `hostname -d`; chomp $mydomain;
foreach my $l ( @ACONF )
{
if ( $l =~ s/^\$max_servers = .*;/\$max_servers = $VSCount;/ )
{
- #fix bnc#450888 : remove the supplementary entries
next if $ismax;
$ismax = 1;
}
if ( $l =~ s/^\$myhostname = .*;/\$myhostname = '$myhostname';/ )
{
- #fix bnc#450888 : remove the supplementary entries
next if $ismyhostname;
$ismyhostname = 1;
}
+ if ( $l =~ s/^\$mydomain = .*;/\$mydomain = '$mydomain';/ )
+ {
+ push @CONF, $l;
+ next ;
+ }
$l =~ s/(.*)/# $1/ if $l =~ /bypass_virus_checks_acl.*=.*qw\( \./;
if( $isclam || $l =~ /Clam Antivirus-clamd/ )
{

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages