Author: varkoly Date: Fri Feb 8 13:39:02 2008 New Revision: 44277 URL: http://svn.opensuse.org/viewcvs/yast?rev=44277&view=rev Log: Fixing bug #359896 - No FQDN set for myhostname for amavisd-new Modified: branches/SuSE-SLE-10-SP2-Branch/mail-server/src/YaPI/MailServer.pm Modified: branches/SuSE-SLE-10-SP2-Branch/mail-server/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/mail-server/src/YaPI/MailServer.pm?rev=44277&r1=44276&r2=44277&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/mail-server/src/YaPI/MailServer.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/mail-server/src/YaPI/MailServer.pm Fri Feb 8 13:39:02 2008 @@ -2759,6 +2759,7 @@ my $aconf = "/etc/amavisd.conf"; my $cconf = "/etc/clamd.conf"; my $clamsock = '/var/lib/clamav/clamd-socket'; + my @ACONFNEW = (); if( ! open(IN,$aconf) ) { @@ -2781,12 +2782,25 @@ $l =~ s/^(.*\").*(\".*)$/$1$clamsock$2/; } } + if( $l =~ /\$mydomain.*=.*/ ) + { + my $tmp = `hostname -d`; + chomp $tmp; + $l = '$mydomain = '."'$tmp'"; + } + if( $l =~ /\$myhostname.*=.*/ ) + { + my $tmp = `hostname -f`; + chomp $tmp; + $l = '$myhostname = '."'$tmp'"; + } + push @ACONFNEW, $l; } if( ! open(OUT,">$aconf.new") ) { return "Error: $!"; } - print OUT @ACONF; + print OUT @ACONFNEW; close(OUT); if( ! open(IN,$cconf) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org