Mailinglist Archive: yast-commit (459 mails)

< Previous Next >
[yast-commit] r61056 - in /branches/SuSE-Code-11-SP1-Branch/mail: package/yast2-mail.changes src/YaPI/MailServer.pm
  • From: varkoly@xxxxxxxxxxxxxxxx
  • Date: Sun, 28 Feb 2010 18:57:50 -0000
  • Message-id: <E1NloKs-0003db-IO@xxxxxxxxxxxxxxxx>
Author: varkoly
Date: Sun Feb 28 19:57:49 2010
New Revision: 61056

URL: http://svn.opensuse.org/viewcvs/yast?rev=61056&view=rev
Log:
bnc#584093 yast2-mail creates bad amavisd.conf

Modified:
branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes
branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm

Modified: branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes?rev=61056&r1=61055&r2=61056&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/mail/package/yast2-mail.changes Sun Feb 28
19:57:49 2010
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Sun Feb 28 18:38:18 UTC 2010 - varkoly@xxxxxxxxxx
+
+- bnc#584093 yast2-mail creates bad amavisd.conf
+
+-------------------------------------------------------------------
Wed Jan 27 16:11:08 CET 2010 - jsuchome@xxxxxxx

- fixed syntax errors

Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm?rev=61056&r1=61055&r2=61056&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm (original)
+++ branches/SuSE-Code-11-SP1-Branch/mail/src/YaPI/MailServer.pm Sun Feb 28
19:57:49 2010
@@ -2403,6 +2403,14 @@
# We create all the DNS attributes. `hostname -f` is the NS and
MX entry.
my $serial = POSIX::strftime("%Y%m%d%H",localtime);
my $host = `hostname -f`; chomp $host;
+ if( ! $host )
+ {
+ $host = `cat /etc/HOSTNAME`; chomp $host;
+ if( ! $host )
+ {
+ $host = 'linux.lokal';
+ }
+ }
my $tmp = { 'Objectclass' => [
'dNSZone','suseMailDomain' ],
'zoneName' => $name,
'suseMailDomainType' => $type,
@@ -2966,6 +2974,19 @@
my $ismyhostname = 0;
my $myhostname = `hostname -f`; chomp $myhostname;
my $mydomain = `hostname -d`; chomp $mydomain;
+ if( ! $myhostname )
+ {
+ $myhostname = `cat /etc/HOSTNAME`; chomp $myhostname;
+ if( ! $myhostname )
+ {
+ $myhostname = 'linux.lokal';
+ }
+ }
+ if( ! $mydomain )
+ {
+ my $tmp;
+ ( $tmp, $mydomain) = split /,/,$myhostname,2;
+ }
foreach my $l ( @ACONF )
{
if ( $l =~ s/^\$max_servers = .*;/\$max_servers = $VSCount;/ )

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

< Previous Next >
This Thread
  • No further messages