diff options
| author | Arnaud Desmons <adesmons@mandriva.com> | 2002-08-21 15:45:15 +0000 |
|---|---|---|
| committer | Arnaud Desmons <adesmons@mandriva.com> | 2002-08-21 15:45:15 +0000 |
| commit | e00efc0daf09e2c3078da363d9e25ee358c4357a (patch) | |
| tree | cc029094478a5167e546f91b128d95ad6cfa2511 /postfix_wizard | |
| parent | e748dceb1898f65ddcce9e8f16ccf16b689fabad (diff) | |
| download | drakwizard-e00efc0daf09e2c3078da363d9e25ee358c4357a.tar drakwizard-e00efc0daf09e2c3078da363d9e25ee358c4357a.tar.gz drakwizard-e00efc0daf09e2c3078da363d9e25ee358c4357a.tar.bz2 drakwizard-e00efc0daf09e2c3078da363d9e25ee358c4357a.tar.xz drakwizard-e00efc0daf09e2c3078da363d9e25ee358c4357a.zip | |
fillfunc added
Diffstat (limited to 'postfix_wizard')
| -rw-r--r-- | postfix_wizard/scripts/Postfixconf.pm | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/postfix_wizard/scripts/Postfixconf.pm b/postfix_wizard/scripts/Postfixconf.pm index 03c5658e..52cc13f2 100644 --- a/postfix_wizard/scripts/Postfixconf.pm +++ b/postfix_wizard/scripts/Postfixconf.pm @@ -7,9 +7,27 @@ use MDK::Common; use strict; my $o = DrakconnectConf->new(); +my $wiz_domain_name = $o->get("DomainName"); +my $wiz_host_name = $o->get("SystemName"); + +sub get_mail_masquerade { + my $login = `logname`; + my $relayhost = `postconf -h relayhost`; + chomp($relayhost); + ($relayhost) = $relayhost =~ /.*\.(.*\..*)/; + !length $relayhost and $relayhost = $wiz_domain_name; + chomp($login); + "$login\@$relayhost"; +} + +sub get_mail_relay { + my $relayhost = `postconf -h relayhost`; + chomp $relayhost; + !length $relayhost and $relayhost = "smtp.$wiz_domain_name"; + $relayhost; +} sub do_it { - my $wiz_domain_name = $o->get("DomainName"); my $wiz_host_name = $o->get("SystemName"); my @conf = qw(/etc/postfix/aliases /etc/postfix/canonical @@ -38,7 +56,7 @@ sub do_it { my $canon = "\n\@$wiz_domain_name \@$ENV{wiz_mail_masquerade}"; my $t; foreach (cat_($file)) { - if (/^\s*(?!\#)\s*\@.*\@.*\@.*\..*/) { + if (/^\s*(?!\#)\s*\@.*\@.*\@.*/) { $t = $_; last; } |