Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: yast-commit (1224 mails)

< Previous Next >
[yast-commit] r59680 - in /branches/SuSE-Code-11-Branch/mail: ./ agents/ package/ src/ src/YaPI/ users-plugin/
  • From: varkoly@xxxxxxxxxxxxxxxx
  • Date: Sat, 21 Nov 2009 14:04:47 -0000
  • Message-id: <E1NBqZz-0003nQ-CN@xxxxxxxxxxxxxxxx>
Author: varkoly
Date: Sat Nov 21 15:04:46 2009
New Revision: 59680

URL: http://svn.opensuse.org/viewcvs/yast?rev=59680&view=rev
Log:
Merge changes since GM
bnc#555814 – VUL-0: SMTPD_LISTEN_REMOTE='yes' by default

Modified:
branches/SuSE-Code-11-Branch/mail/VERSION
branches/SuSE-Code-11-Branch/mail/agents/MasterCFParser.pm (contents,
props changed)
branches/SuSE-Code-11-Branch/mail/agents/sysconfig.mail (contents, props
changed)
branches/SuSE-Code-11-Branch/mail/package/yast2-mail.changes
branches/SuSE-Code-11-Branch/mail/src/MailServer.ycp
branches/SuSE-Code-11-Branch/mail/src/YaPI/MailServer.pm
branches/SuSE-Code-11-Branch/mail/src/mail-server_complex.ycp
branches/SuSE-Code-11-Branch/mail/src/mail-server_dialogs.ycp
branches/SuSE-Code-11-Branch/mail/src/suse-mailserver.schema
branches/SuSE-Code-11-Branch/mail/users-plugin/users_plugin_mail_groups.ycp

Modified: branches/SuSE-Code-11-Branch/mail/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/VERSION?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/VERSION (original)
+++ branches/SuSE-Code-11-Branch/mail/VERSION Sat Nov 21 15:04:46 2009
@@ -1 +1 @@
-2.17.3
+2.17.4

Modified: branches/SuSE-Code-11-Branch/mail/agents/MasterCFParser.pm
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/agents/MasterCFParser.pm?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/agents/MasterCFParser.pm (original)
+++ branches/SuSE-Code-11-Branch/mail/agents/MasterCFParser.pm Sat Nov 21
15:04:46 2009
@@ -71,7 +71,6 @@

package MasterCFParser;
use strict;
-use Data::Dumper;
no warnings 'redefine';


######################################################################################
@@ -140,8 +139,10 @@
while( defined $CFA[$c+1] && $CFA[$c+1] =~ /^\s+/ ) {
$line .= $CFA[++$c];
}
-
- push @$cfa, line2service($line);
+ if( $line =~ /\w+/ )
+ { #avoid emty lines
+ push @$cfa, line2service($line);
+ }
}
$this->{MCF} = $cfa;
return 0;
@@ -247,7 +248,10 @@
next if defined $s->{comment};
$foundmatches = 0;
foreach my $fs ( keys %$fsrv ) {
- $foundmatches++ if $fsrv->{$fs} eq $s->{$fs};
+ if( defined $fsrv->{$fs} && defined $s->{$fs} )
+ {
+ $foundmatches++ if $fsrv->{$fs} eq $s->{$fs};
+ }
}
push @$retsrv, $s if $foundmatches == $nrkeys;
}
@@ -420,7 +424,11 @@
my $line = '';
if( defined $srv->{comment} ) {
$line = $srv->{comment};
- } else {
+ }
+ elsif( defined $srv->{service} && defined $srv->{type} && defined
$srv->{private} &&
+ defined $srv->{unpriv} && defined $srv->{chroot} && defined
$srv->{wakeup} &&
+ defined $srv->{maxproc} && defined $srv->{command} )
+ {
$line =
sprintf("%-8s %-5s %-6s %-7s %-7s %-8s %-7s %s",
$srv->{service},

Modified: branches/SuSE-Code-11-Branch/mail/agents/sysconfig.mail
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/agents/sysconfig.mail?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/agents/sysconfig.mail (original)
+++ branches/SuSE-Code-11-Branch/mail/agents/sysconfig.mail Sat Nov 21 15:04:46
2009
@@ -30,13 +30,13 @@
# If set to "no" or empty then only mail from localhost
# will be accepted.
#
-SMTPD_LISTEN_REMOTE="yes"
+SMTPD_LISTEN_REMOTE="no"

## Type: yesno
## Default: no
#
# Set this to "yes" if the yast2 mail module must not
-# start with the with the vizard for asking the
+# start with the wizard for asking the
# configuration type of the mail server.
#
SKIP_ASK="no"

Modified: branches/SuSE-Code-11-Branch/mail/package/yast2-mail.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/package/yast2-mail.changes?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/package/yast2-mail.changes (original)
+++ branches/SuSE-Code-11-Branch/mail/package/yast2-mail.changes Sat Nov 21
15:04:46 2009
@@ -1,4 +1,40 @@
-------------------------------------------------------------------
+Sat Nov 21 15:02:51 CET 2009 - varkoly@xxxxxxx
+
+- bnc#555814 – VUL-0: SMTPD_LISTEN_REMOTE="yes" by default
+
+-------------------------------------------------------------------
+Mon Mar 9 22:15:36 CET 2009 - varkoly@xxxxxxx
+
+- bnc#483639 - yast2 mail server's master.cf parser do not writes some lines
+
+-------------------------------------------------------------------
+Sun Jan 25 19:20:19 CET 2009 - varkoly@xxxxxxx
+
+- saslauthd and cyrus must be started and enabled by YaPI
+- Serial of SOA Record must not be greater then 4294967295
+
+-------------------------------------------------------------------
+Thu Jan 22 10:12:09 CET 2009 - varkoly@xxxxxxx
+
+- bnc#467589 - Cyrus don't create Directory for new LDAP User at first run.
+- bnc#467562 - Yast mail doesn't install needed Spamassassin Package for SPAM
learning extension for Mailserver
+
+-------------------------------------------------------------------
+Mon Jan 19 16:49:10 CET 2009 - varkoly@xxxxxxx
+
+- bnc#466748 - yast2-mail-plugins broken
+
+-------------------------------------------------------------------
+Thu Jan 8 13:17:02 CET 2009 - varkoly@xxxxxxx
+
+- avoid undefined variables in the MasterCFParser
+- make progress bar by WriteDialog visable
+- bnc#463589 - YaST2 Mail Server & amavisd
+- the myhostname in /etc/amavisd.conf must be set to FQHN
+- bnc#463430 - Mail to a shared folder can couse infinit loop
+
+-------------------------------------------------------------------
Fri Dec 12 06:37:41 CET 2008 - varkoly@xxxxxxx

- bnc#458553 - YaSt2 Mail module do not install cyrus-sasl-saslauthd

Modified: branches/SuSE-Code-11-Branch/mail/src/MailServer.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/src/MailServer.ycp?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/src/MailServer.ycp (original)
+++ branches/SuSE-Code-11-Branch/mail/src/MailServer.ycp Sat Nov 21 15:04:46
2009
@@ -162,7 +162,6 @@
global boolean pam_ldap_installed = false;
global boolean nss_ldap_installed = false;
global boolean procmail_installed = false;
-global boolean amavis_installed = false;
global boolean ldap_installed = false;
global boolean cyrus_installed = false;
global boolean postfix_installed = false;
@@ -170,6 +169,9 @@
global boolean sasl_installed = false;
global boolean saslauthd_installed = false;
global boolean plugins_installed = false;
+global boolean amavis_installed = false;
+global boolean spamassassin_installed=false;
+global boolean clamav_installed = false;

/*
* Help funktion to check the DNS Settings
@@ -268,10 +270,12 @@
postfix_installed = Installed("postfix");
fetchmail_installed = Installed("fetchmail");
ldap_installed = Installed("yast2-ldap-client");
- amavis_installed = Installed("amavisd-new");
sasl_installed = Installed("cyrus-sasl-plain");
saslauthd_installed = Installed("cyrus-sasl-saslauthd");
plugins_installed = Installed("yast2-mail-plugins");
+ amavis_installed = Installed("amavisd-new");
+ clamav_installed = Installed("clamav");
+ spamassassin_installed= Installed("spamassassin");
string to_install = "";
list<string> l_to_install = [];

@@ -310,13 +314,6 @@
l_to_install = add( l_to_install, "yast2-mail-plugins" );
to_install = to_install + "yast2-mail-plugins\n";
}
- if(!amavis_installed)
- {
- l_to_install = add( l_to_install, "amavisd-new" );
- to_install = to_install + "amavisd-new\n";
- l_to_install = add( l_to_install, "clamav" );
- to_install = to_install + "clamav\n";
- }
if(to_install != "")
{
if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
@@ -504,13 +501,13 @@
/* Progress stage 1/7 */
_("Write mail server global settings"),
/* Progress stage 2/7 */
- _("Write mail server transports"),
+ _("Write mail server local delivery settings"),
/* Progress stage 3/7 */
- _("Write mail server prevention settings"),
+ _("Write mail server transports"),
/* Progress stage 4/7 */
- _("Write mail server relaying settings"),
+ _("Write mail server prevention settings"),
/* Progress stage 5/7 */
- _("Write mail server local delivery settings"),
+ _("Write mail server relaying settings"),
/* Progress stage 6/3 */
_("Write mail fetching jobs"),
/* Progress stage 7/7 */
@@ -519,13 +516,13 @@
/* Progress stage 1/7 */
_("Writing mail server global settings..."),
/* Progress stage 2/7 */
- _("Writing mail server transports..."),
+ _("Writing mail server local delivery settings..."),
/* Progress stage 3/7 */
- _("Writing mail server prevention settings..."),
+ _("Writing mail server transports..."),
/* Progress stage 4/7 */
- _("Writing mail server relaying settings..."),
+ _("Writing mail server prevention settings..."),
/* Progress stage 5/7 */
- _("Writing mail server local delivery settings..."),
+ _("Writing mail server relaying settings..."),
/* Progress stage 6/3 */
_("Writing mail fetching jobs..."),
/* Progress stage 7/7 */
@@ -550,66 +547,6 @@
}
sleep(sl);

- // write mail transports
- if(Abort()) return false;
- Progress::NextStep();
- if( (boolean)MailTransports["Changed"]:false ) {
- // First we have to clean up TLS Sites
- if( !
YaPI::MailServer::WriteMailTransports(MailTransports,AdminPassword) ) {
- Report::Error(_("Cannot write mail server transports."));
- }
- }
- sleep(sl);
-
- // write mail preventions
- if(Abort()) return false;
- Progress::NextStage();
- if((boolean)MailPrevention["VirusScanning"]:false) {
- if(! amavis_installed)
- {
- if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
- "\n clamav \n amavisd-new \n",
- Label::InstallButton(),
- Label::AbortButton(),
- `focus_yes))
- {
- Package::DoInstall(["clamav","amavisd-new"]);
- Service::Start("clamd");
- Service::Start("freshclam");
- Service::Start("amavis");
- y2milestone("Installing amavis");
- }
- else
- {
- return false;
- }
- }
- Service::Enable("amavis");
- Service::Enable("clamd");
- Service::Enable("freshclam");
- }
- if( (boolean)MailPrevention["Changed"]:false ) {
- if( !
YaPI::MailServer::WriteMailPrevention(MailPrevention,AdminPassword) ) {
- Report::Error(_("Cannot write mail server preventions."));
- }
- if((boolean)MailPrevention["VirusScanning"]:false) {
- Service::Restart("clamd");
- Service::Restart("freshclam");
- Service::Restart("amavis");
- }
- }
- sleep(sl);
-
- // write mail realaying
- if(Abort()) return false;
- Progress::NextStage();
- if( (boolean)MailRelaying["Changed"]:false ) {
- if( ! YaPI::MailServer::WriteMailRelaying(MailRelaying,AdminPassword) ) {
- Report::Warning(_("Cannot write the mail server relay settings."));
- }
- }
- sleep(sl);
-
// write mail local delivery
// first we looking for if all the needed packages are installed
if(MailLocalDelivery["Type"]:"none" == "procmail"){
@@ -636,38 +573,26 @@
}

if(MailLocalDelivery["Type"]:"none" == "cyrus") {
- if(!cyrus_installed)
- {
- if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
- "\n cyrus-imapd \n",
- Label::InstallButton(),
- Label::AbortButton(),
- `focus_yes))
- {
- Package::DoInstall(["cyrus-imapd"]);
- SCR::UnmountAgent(.etc.imapd_conf);
- }
- else
- {
- return false;
- }
- }
- string crypted = Users::CryptPassword(AdminPassword, "system", "foo");
- SCR::Write(.target.passwd.cyrus, crypted);
-
- list Values = SCR::Dir(.etc.imapd_conf);
- SCR::Write(.etc.imapd_conf.allowplaintext,"yes");
- if(!contains(Values,"unixhierarchysep")) {
- SCR::Write(.etc.imapd_conf.unixhierarchysep,"yes");
- }
- if(!contains(Values,"allowplainwithouttls")) {
- SCR::Write(.etc.imapd_conf.allowplainwithouttls,"yes");
- }
- SCR::Write(.etc.imapd_conf,nil);
- if(Service::Status("cyrus") > 0) {
- Service::Start("cyrus");
- Service::Enable("cyrus");
- }
+ if(!cyrus_installed)
+ {
+ if ( Report::AnyQuestion ("",_("You have not installed all needed
packages.") +
+ "\n cyrus-imapd \n",
+ Label::InstallButton(),
+ Label::AbortButton(),
+ `focus_yes))
+ {
+ Package::DoInstall(["cyrus-imapd"]);
+ SCR::UnmountAgent(.etc.imapd_conf);
+ }
+ else
+ {
+ return false;
+ }
+ }
+ string crypted = Users::CryptPassword(AdminPassword, "system", "foo");
+ SCR::Write(.target.passwd.cyrus, crypted);
+ y2milestone("--- Enabling cyrus --");
+ Service::Enable("cyrus");
} else {
if(cyrus_installed) {
Service::Stop("cyrus");
@@ -681,7 +606,102 @@
Report::Warning(_("Cannot write the mail server local delivery
settings."));
}
if(MailLocalDelivery["Type"]:"none" == "cyrus") {
- Service::Reload("cyrus");
+ y2milestone("--- Stop cyrus --");
+ Service::Stop("cyrus");
+ y2milestone("--- Start cyrus --");
+ Service::Start("cyrus");
+ sleep(10000);
+ YaPI::MailServer::CreateRootMailbox(AdminPassword);
+ }
+ }
+ sleep(sl);
+
+ // write mail transports
+ if(Abort()) return false;
+ Progress::NextStep();
+ if( (boolean)MailTransports["Changed"]:false ) {
+ // First we have to clean up TLS Sites
+ if( !
YaPI::MailServer::WriteMailTransports(MailTransports,AdminPassword) ) {
+ Report::Error(_("Cannot write mail server transports."));
+ }
+ }
+ sleep(sl);
+
+ // write mail preventions
+ if(Abort()) return false;
+ Progress::NextStage();
+ if((boolean)MailPrevention["VirusScanning"]:false)
+ {
+ string to_install = "";
+ list<string> l_to_install = [];
+ if(!amavis_installed)
+ {
+ l_to_install = add( l_to_install, "amavisd-new" );
+ to_install = to_install + "\n amavisd-new";
+ if(!clamav_installed)
+ {
+ l_to_install = add( l_to_install, "clamav" );
+ to_install = to_install + "\n clamav";
+ }
+ if(!spamassassin_installed)
+ {
+ l_to_install = add( l_to_install, "spamassassin" );
+ to_install = to_install + "\n spamassassin";
+ }
+ if(! amavis_installed || !clamav_installed ||
!spamassassin_installed)
+ {
+ if ( Report::AnyQuestion ("",_("You have not installed all
needed packages.") +
+ to_install,
+ Label::InstallButton(),
+ Label::AbortButton(),
+ `focus_yes))
+ {
+ Package::DoInstall(l_to_install);
+ y2milestone("Installing amavis");
+ }
+ else
+ {
+ return false;
+ }
+ Service::Start("clamd");
+ Service::Start("freshclam");
+ Service::Start("amavis");
+ }
+ Service::Enable("amavis");
+ Service::Enable("clamd");
+ Service::Enable("freshclam");
+ }
+ }
+ if( (boolean)MailPrevention["Changed"]:false ) {
+ if( !
YaPI::MailServer::WriteMailPrevention(MailPrevention,AdminPassword) ) {
+ Report::Error(_("Cannot write mail server preventions."));
+ }
+ if((boolean)MailPrevention["VirusScanning"]:false) {
+ Service::Enable("amavis");
+ Service::Enable("clamd");
+ Service::Enable("freshclam");
+ Service::Restart("clamd");
+ Service::Restart("freshclam");
+ Service::Restart("amavis");
+ }
+ else
+ {
+ Service::Stop("clamd");
+ Service::Stop("freshclam");
+ Service::Stop("amavis");
+ Service::Disable("amavis");
+ Service::Disable("clamd");
+ Service::Disable("freshclam");
+ }
+ }
+ sleep(sl);
+
+ // write mail realaying
+ if(Abort()) return false;
+ Progress::NextStage();
+ if( (boolean)MailRelaying["Changed"]:false ) {
+ if( ! YaPI::MailServer::WriteMailRelaying(MailRelaying,AdminPassword) ) {
+ Report::Warning(_("Cannot write the mail server relay settings."));
}
}
sleep(sl);

Modified: branches/SuSE-Code-11-Branch/mail/src/YaPI/MailServer.pm
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/src/YaPI/MailServer.pm?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/src/YaPI/MailServer.pm (original)
+++ branches/SuSE-Code-11-Branch/mail/src/YaPI/MailServer.pm Sat Nov 21
15:04:46 2009
@@ -348,7 +348,14 @@
'command' => 'smtp' });
if(! defined $smtpsrv )
{
- SCR->Execute('.mail.postfix.mastercf.addService', { 'service' =>
'smtp', 'command' => 'smtp' });
+ SCR->Execute('.mail.postfix.mastercf.addService', { 'service' =>
'smtp',
+ 'type' => 'inet',
+ 'private' => 'n',
+ 'unpriv' => '-',
+ 'chroot' => 'n',
+ 'wakeup' => '-',
+ 'maxproc' => '-',
+ 'command' => 'smtpd' });
}
}

@@ -1161,44 +1168,38 @@
}

# Now we looking for if vscan (virusscanning) is started.
- my $vscan = SCR->Execute('.mail.postfix.mastercf.findService',
+ my $vscanin = SCR->Execute('.mail.postfix.mastercf.findService',
{ 'service' => 'localhost:10025',
'command' => 'smtpd'} );
- my $smtp = SCR->Execute('.mail.postfix.mastercf.findService',
- { 'service' => 'smtp',
- 'command' => 'smtpd'});
-#print STDERR "SMTP";
-#print STDERR Dumper ($smtp);
-#print STDERR "VSCAN";
-#print STDERR Dumper ($vscan);
- if( defined $smtp->[0] && defined $smtp->[0]->{'options'} )
- {
- if( $smtp->[0]->{'options'}->{'content_filter'} eq
'smtp:[127.0.0.1]:10024' && $vscan )
- {
- $MailPrevention{'VirusScanning'} = YaST::YCP::Boolean(1);
- if( ! open(IN,$aconf) )
- {
- return "Error: $!";
- }
- my @ACONF = <IN>;
- close(IN);
- my $ismax = 0;
- foreach ( @ACONF )
- {
- s/\s+//g;
+ my $vscanout = SCR->Execute('.mail.postfix.mastercf.findService',
+ { 'service' => 'amavis',
+ 'command' => 'lmtp'} );
+ my $content_filter = read_attribute($MainCf,'content_filter');
+
+ if( $content_filter eq 'amavis:[127.0.0.1]:10024' && $vscanin && $vscanout)
+ {
+ $MailPrevention{'VirusScanning'} = YaST::YCP::Boolean(1);
+ if( ! open(IN,$aconf) )
+ {
+ return "Error: $!";
+ }
+ my @ACONF = <IN>;
+ close(IN);
+ my $ismax = 0;
+ foreach ( @ACONF )
+ {
+ s/\s+//g;
if ( /^\$max_servers=(\d+)/ )
{
- $MailPrevention{'VSCount'} = YaST::YCP::Integer($1);
+ $MailPrevention{'VSCount'} = YaST::YCP::Integer($1);
}
$ismax = 1;
- }
- if( !$ismax )
- {
- $MailPrevention{'VSCount'} = YaST::YCP::Integer(5);
- }
- }
+ }
+ if( !$ismax )
+ {
+ $MailPrevention{'VSCount'} = YaST::YCP::Integer(2);
+ }
}
-
# make IMAP connection
my $imap = new Net::IMAP($imaphost, Debug => 0);
if( $imap )
@@ -1211,6 +1212,7 @@
$MailPrevention{'SpamLearning'} = YaST::YCP::Boolean(1);
}
}
+ $imap->logout();
}

return \%MailPrevention;
@@ -1372,34 +1374,64 @@
code => "VIRUS_SCANNER_FAILED",
description => "activating the virus scanner
failed: $err");
}
- if( SCR->Execute('.mail.postfix.mastercf.findService',
- { 'service' => 'smtp', 'command' => 'smtpd' }))
- {
- SCR->Execute('.mail.postfix.mastercf.modifyService',
- { 'service' => 'smtp',
- 'command' => 'smtpd',
- 'maxproc' => $MailPrevention->{'VSCount'},
- 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' }
} );
- }
- else
+ # This is only for systems updated from SLES10
+ my $smtps = SCR->Execute('.mail.postfix.mastercf.findService',
+ { 'service' => 'smtps', 'command' =>
'smtpd' });
+ if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} )
+ {
+ my $opts = $smtps->[0]->{options};
+ if ( defined $opts->{'content_filter'} )
+ {
+ delete $opts->{'content_filter'};
+ SCR->Execute('.mail.postfix.mastercf.modifyService',
+ { 'service' => 'smtps',
+ 'command' => 'smtpd',
+ 'maxproc' => '-',
+ 'options' => $opts } );
+ }
+ }
+ my $smtp = SCR->Execute('.mail.postfix.mastercf.findService',
+ { 'service' => 'smtp', 'command' =>
'smtpd' });
+ if( ref($smtp) eq 'ARRAY' && defined $smtp->[0]->{options} )
+ {
+ my $opts = $smtp->[0]->{options};
+ if ( defined $opts->{'content_filter'} )
+ {
+ delete $opts->{'content_filter'};
+ SCR->Execute('.mail.postfix.mastercf.modifyService',
+ { 'service' => 'smtp',
+ 'command' => 'smtpd',
+ 'maxproc' => '-',
+ 'options' => $opts } );
+ }
+ }
+ # End This is only for systems updated from SLES10
+ if( SCR->Execute('.mail.postfix.mastercf.findService',
+ { 'service' => 'localhost:10025', 'command' => 'smtpd' }))
{
- SCR->Execute('.mail.postfix.mastercf.addService',
- { 'service' => 'smtp',
- 'command' => 'smtpd',
+ SCR->Execute('.mail.postfix.mastercf.deleteService',
+ { 'service' => 'localhost:10025', 'command' => 'smtpd' });
+ }
+ if( SCR->Execute('.mail.postfix.mastercf.findService',
+ { 'service' => 'amavis', 'command' => 'lmtp' }))
+ {
+ SCR->Execute('.mail.postfix.mastercf.deleteService',
+ { 'service' => 'amavis', 'command' => 'lmtp' });
+ }
+ # create smtpd pocess for getting back the emails
+ SCR->Execute('.mail.postfix.mastercf.addService',
+ { 'service' => 'amavis',
+ 'command' => 'lmtp',
+ 'type' => 'unix',
+ 'private' => '-',
+ 'unpriv' => '-',
+ 'chroot' => '-',
+ 'wakeup' => '-',
'maxproc' => $MailPrevention->{'VSCount'},
- 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' }
} );
- }
- my $smtps = SCR->Execute('.mail.postfix.mastercf.findService',
- { 'service' => 'smtps', 'command' => 'smtpd'
});
- if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} )
- {
- my $opts = $smtps->[0]->{options};
- $opts->{'content_filter'} = 'smtp:[127.0.0.1]:10024';
- SCR->Execute('.mail.postfix.mastercf.modifyService',
- { 'service' => 'smtps',
- 'command' => 'smtpd',
- 'options' => $opts } );
- }
+ 'options' => { lmtp_data_done_timeout => 1200,
+ lmtp_send_xforward_command => 'yes',
+ disable_dns_lookups => 'yes',
+ max_use => 20 } } );
SCR->Execute('.mail.postfix.mastercf.addService',
{ 'service' => 'localhost:10025',
'command' => 'smtpd',
@@ -1409,30 +1441,40 @@
'chroot' => 'n',
'wakeup' => '-',
'maxproc' => '-',
- 'options' => { 'content_filter' => '' } } );
+ 'options' => { content_filter => '',
+ local_recipient_maps => '',
+ relay_recipient_maps => '',
+ smtpd_delay_reject => 'no',
+ smtpd_restriction_classes => '',
+ smtpd_client_restrictions => '',
+ smtpd_helo_restrictions => '',
+ smtpd_sender_restrictions => '',
+ smtpd_recipient_restrictions =>
'permit_mynetworks,reject',
+ smtpd_data_restrictions =>
'reject_unauth_pipelining',
+ smtpd_end_of_data_restrictions => '',
+ mynetworks => '127.0.0.0/8',
+ smtpd_error_sleep_time => '0',
+ smtpd_soft_error_limit => '1001',
+ smtpd_hard_error_limit => '1000',
+ smtpd_client_connection_count_limit => '0',
+ smtpd_client_connection_rate_limit => '0',
+ receive_override_options =>
'no_header_body_checks,no_unknown_recipient_checks'
+ }
+ } );
+ write_attribute($MainCf,'content_filter','amavis:[127.0.0.1]:10024');
}
else
{
- SCR->Execute('.mail.postfix.mastercf.deleteService',
- { 'service' => 'localhost:10025', 'command' => 'smtpd' });
- SCR->Execute('.mail.postfix.mastercf.modifyService',
- { 'service' => 'smtp', 'command' => 'smtpd', 'options' => {} } );
-
- my $smtps = SCR->Execute('.mail.postfix.mastercf.findService',
- { 'service' => 'smtps', 'command' => 'smtpd'
});
- if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} )
- {
- my $opts = $smtps->[0]->{options};
- delete $opts->{'content_filter'};
- SCR->Execute('.mail.postfix.mastercf.modifyService',
- { 'service' => 'smtps',
- 'command' => 'smtpd',
- 'options' => $opts });
- }
- Service->Stop('amavis');
- Service->Stop('clamd');
- Service->Disable('amavis');
- Service->Disable('clamd');
+ SCR->Execute('.mail.postfix.mastercf.deleteService',
+ { 'service' => 'localhost:10025', 'command' => 'smtpd' });
+ SCR->Execute('.mail.postfix.mastercf.deleteService',
+ { 'service' => 'amavis', 'command' => 'lmtp' });
+ write_attribute($MainCf,'content_filter','');
+
+ Service->Stop('amavis');
+ Service->Stop('clamd');
+ Service->Disable('amavis');
+ Service->Disable('clamd');
}

# now we looks if the ldap entries in the main.cf for the access table are
OK.
@@ -1468,13 +1510,13 @@
setfacl -m u:vscan:rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
setfacl -m m::rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}

-su - vscan -c "/usr/bin/sa-learn --sync"
+/usr/bin/sa-learn --sync --dbpath /var/spool/amavis/.spamassassin/
(
for i in `ls /var/spool/imap/NewSpam/[0-9]* 2> /dev/null`
do
setfacl -m user:vscan:r-x $i
echo $i
- su - vscan -c "/usr/bin/sa-learn --spam $i"
+ /usr/bin/sa-learn --spam --dbpath /var/spool/amavis/.spamassassin/ $i
rm $i
done
) >> $LOG 2>&1
@@ -1485,22 +1527,26 @@
do
setfacl -m user:vscan:r-x $i
echo $i
- su - vscan -c "/usr/bin/sa-learn --ham $i"
+ /usr/bin/sa-learn --ham --dbpath /var/spool/amavis/.spamassassin/ $i
rm $i
done
) >> $LOG 2>&1
su - cyrus -c "reconstruct NoSpam" &>/dev/null
+chown -R vscan /var/spool/amavis/.spamassassin/

setfacl -b /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
';

SCR->Write(".target.string","/etc/cron.hourly/lern-spam",$lernspam);
- SCR->Write(".target.bash","chmod 755
/etc/cron.hourly/lern-spam");
+ SCR->Execute(".target.bash","chmod 755
/etc/cron.hourly/lern-spam");
}
+ $imap->logout();
}
else
{
- SCR->Write(".target.bash","test -e /etc/cron.hourly/lern-spam
&& rm /etc/cron.hourly/lern-spam");
- $ret = $imap->delete('NewSpam');
+ SCR->Execute(".target.bash","test -e /etc/cron.hourly/lern-spam &&
rm /etc/cron.hourly/lern-spam");
+ $ret = $imap->delete('NewSpam');
+ $ret = $imap->delete('NoSpam');
+ $imap->logout();
}
}
return 1;
@@ -1643,7 +1689,6 @@
}

y2milestone("-- WriteMailRelaying --");
-#print STDERR Dumper([$MailRelaying]);
# Make LDAP Connection
my $ldapMap = $self->ReadLDAPDefaults($AdminPassword);
if( !$ldapMap )
@@ -1787,7 +1832,7 @@
my %MailLocalDelivery = (
'Changed' => YaST::YCP::Boolean(0),
'Type' => '',
- 'MailboxSizeLimit'=> '',
+ 'MailboxSizeLimit'=> 0,
'FallBackMailbox' => '',
'SpoolDirectory' => '',
'QuotaLimit' => 90,
@@ -1916,12 +1961,14 @@
if( $MailLocalDelivery->{'Type'} ne 'none')
{
write_attribute($MainCf,'mydestination','$myhostname,
localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf');
- write_attribute($MainCf,'virtual_alias_maps',
'ldap:/etc/postfix/ldaplocal_recipient_maps.cf');
-
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
- write_attribute($MainCf,'alias_maps','hash:/etc/aliases,
ldap:/etc/postfix/ldapalias_maps_member.cf,
ldap:/etc/postfix/ldapalias_maps.cf');
+ write_attribute($MainCf,'virtual_alias_maps',
'ldap:/etc/postfix/ldaplocal_recipient_maps.cf,
ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf,
ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
+
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf');
+ write_attribute($MainCf,'alias_maps','hash:/etc/aliases,
ldap:/etc/postfix/ldapalias_maps_folder.cf,
ldap:/etc/postfix/ldapalias_maps.cf');
+ check_ldap_configuration('alias_maps_folder',$ldapMap);
check_ldap_configuration('alias_maps',$ldapMap);
- check_ldap_configuration('alias_maps_member',$ldapMap);
+ check_ldap_configuration('virtual_alias_maps_member',$ldapMap);
check_ldap_configuration('virtual_alias_maps',$ldapMap);
+ check_ldap_configuration('virtual_alias_domains',$ldapMap);
}
if( $MailLocalDelivery->{'Type'} eq 'local')
{
@@ -1970,6 +2017,9 @@

SCR->Write('.etc.imapd_conf.quotawarn',$MailLocalDelivery->{'QuotaLimit'});

SCR->Write('.etc.imapd_conf.timeout',$MailLocalDelivery->{'ImapIdleTime'});

SCR->Write('.etc.imapd_conf.poptimeout',$MailLocalDelivery->{'PopIdleTime'});
+ SCR->Write('.etc.imapd_conf.allowplaintext','yes');
+ SCR->Write('.etc.imapd_conf.unixhierarchysep','yes');
+ SCR->Write('.etc.imapd_conf.allowplainwithouttls','yes');
if($MailLocalDelivery->{'FallBackMailbox'} ne '' )
{

SCR->Write('.etc.imapd_conf.lmtp_luser_relay',$MailLocalDelivery->{'FallBackMailbox'});
@@ -2054,6 +2104,24 @@
SCR->Execute('.mail.cyrusconf.toggleService', 'pop3s');
}
}
+ Service->Enable('saslauthd');
+ Service->Enable('cyrus');
+ if( !Service->Status('saslauthd') )
+ {
+ Service->Restart('saslauthd');
+ }
+ else
+ {
+ Service->Start('saslauthd');
+ }
+ if( !Service->Status('cyrus') )
+ {
+ Service->Restart('cyrus');
+ }
+ else
+ {
+ Service->Start('cyrus');
+ }
}
elsif( $MailLocalDelivery->{'Type'} eq 'none')
{
@@ -2075,6 +2143,31 @@
return 1;
}

+BEGIN { $TYPEINFO{CreateRootMailbox} =["function", "any", "string"]; }
+sub CreateRootMailbox {
+ my $self = shift;
+ my $AdminPassword = shift;
+
+ #Create mailbox for root
+ my $imap = new Net::IMAP($imaphost, Debug => 0);
+ if( $imap )
+ {
+ my $ret = $imap->login($imapadm, $AdminPassword);
+ if($$ret{Status} eq "ok")
+ {
+ $ret = $imap->select('usr/root');
+ if( $ret->{Status} ne 'ok' )
+ {
+ $ret = $imap->create('user/root');
+ $ret = $imap->setacl('user/root', 'cyrus', "lrswipkxtea");
+ $ret = $imap->setacl('user/root', 'root', "lrswipkxtea");
+ $ret = $imap->setacl('user/root', 'anyone', "" );
+ }
+ }
+ $imap->logout();
+ }
+}
+
BEGIN { $TYPEINFO{ReadFetchingMail} =["function", "any", "string"]; }
sub ReadFetchingMail {
my $self = shift;
@@ -2323,25 +2416,27 @@
}
else
{
- # This is a new domain, we create it.
- # We create all the DNS attributes. `hostname -f` is the NS entry.
- my $serial = POSIX::strftime("%Y%m%d%H%M",localtime);
- my $host = `hostname -f`; chomp $host;
- my $tmp = { 'Objectclass' => [
'dNSZone','suseMailDomain' ],
- 'zoneName' => $name,
- 'suseMailDomainType' => $type,
- 'suseMailDomainMasquerading' => $masquerading,
+ # This is a new domain, we create it.
+ # 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;
+ my $tmp = { 'Objectclass' => [
'dNSZone','suseMailDomain' ],
+ 'zoneName' => $name,
+ 'suseMailDomainType' => $type,
+ 'suseMailDomainMasquerading' => $masquerading,
'relativeDomainName' => '@',
'dNSClass' => 'IN',
'dNSTTL' => '86400',
+ 'nSRecord' => $host.'.',
+ 'mXRecord' => '40 '.$host.'.',
'sOARecord' => $host.'.
root.'.$host.'. '.$serial.' 10800 3600 302400 43200'
- };
- if(! SCR->Write('.ldap.add',{ "dn" => $DN } ,$tmp)){
- my $ldapERR = SCR->Read(".ldap.error");
- return $self->SetError(summary => "LDAP add failed",
- code => "SCR_WRITE_FAILED",
- description => $ldapERR->{'code'}." :
".$ldapERR->{'msg'});
- }
+ };
+ if(! SCR->Write('.ldap.add',{ "dn" => $DN } ,$tmp)){
+ my $ldapERR = SCR->Read(".ldap.error");
+ return $self->SetError(summary => "LDAP add failed",
+ code => "SCR_WRITE_FAILED",
+ description => $ldapERR->{'code'}."
: ".$ldapERR->{'msg'});
+ }
}
}

@@ -2352,14 +2447,19 @@
write_attribute($MainCf,'masquerade_classes','envelope_sender,
header_sender, header_recipient');
write_attribute($MainCf,'masquerade_exceptions','root');
write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain,
$mydomain, ldap:/etc/postfix/ldapmydestination.cf');
- write_attribute($MainCf,'virtual_alias_maps',
'ldap:/etc/postfix/ldaplocal_recipient_maps.cf');
-
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
+ write_attribute($MainCf,'virtual_alias_maps',
'ldap:/etc/postfix/ldaplocal_recipient_maps.cf,
ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf,
ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
+
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf');
+ write_attribute($MainCf,'alias_maps','hash:/etc/aliases,
ldap:/etc/postfix/ldapalias_maps_folder.cf,
ldap:/etc/postfix/ldapalias_maps.cf');
SCR->Write('.mail.postfix.main.table',$MainCf);
SCR->Write('.mail.postfix.main',undef);
check_ldap_configuration('masquerade_domains',$ldapMap);
check_ldap_configuration('mydestination',$ldapMap);
+ check_ldap_configuration('alias_maps_folder',$ldapMap);
check_ldap_configuration('local_recipient_maps',$ldapMap);
+ check_ldap_configuration('alias_maps',$ldapMap);
check_ldap_configuration('virtual_alias_maps',$ldapMap);
+ check_ldap_configuration('virtual_alias_maps_member',$ldapMap);
+ check_ldap_configuration('virtual_alias_domains',$ldapMap);
return 1;
}

@@ -2858,17 +2958,19 @@
write_attribute($MainCf,'masquerade_exceptions','root');
write_attribute($MainCf,'content_filter','');
write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain,
$mydomain, ldap:/etc/postfix/ldapmydestination.cf');
- write_attribute($MainCf,'virtual_alias_maps',
'ldap:/etc/postfix/ldaplocal_recipient_maps.cf');
-
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
- write_attribute($MainCf,'alias_maps','hash:/etc/aliases,
ldap:/etc/postfix/ldapalias_maps.cf,
ldap:/etc/postfix/ldapalias_maps_member.cf');
+ write_attribute($MainCf,'virtual_alias_maps',
'ldap:/etc/postfix/ldaplocal_recipient_maps.cf,
ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf,
ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
+
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf');
+ write_attribute($MainCf,'alias_maps','hash:/etc/aliases,
ldap:/etc/postfix/ldapalias_maps_folder.cf,
ldap:/etc/postfix/ldapalias_maps.cf');
check_ldap_configuration('transport_maps',$ldapMap);
check_ldap_configuration('smtp_tls_per_site',$ldapMap);
check_ldap_configuration('masquerade_domains',$ldapMap);
check_ldap_configuration('mydestination',$ldapMap);
check_ldap_configuration('local_recipient_maps',$ldapMap);
- check_ldap_configuration('virtual_alias_maps',$ldapMap);
+ check_ldap_configuration('alias_maps_folder',$ldapMap);
check_ldap_configuration('alias_maps',$ldapMap);
- check_ldap_configuration('alias_maps_member',$ldapMap);
+ check_ldap_configuration('virtual_alias_maps',$ldapMap);
+ check_ldap_configuration('virtual_alias_maps_member',$ldapMap);
+ check_ldap_configuration('virtual_alias_domains',$ldapMap);
SCR->Write('.mail.postfix.main.table',$MainCf);
SCR->Write('.mail.postfix.main',undef);
SCR->Write('.mail.postfix.mastercf',undef);
@@ -2908,16 +3010,28 @@
my @ACONF = <IN>;
close(IN);

- my $isclam = 0;
- my $ismax = 0;
+ my $isclam = 0;
+ 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';/ )
+ {
+ 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/ )
{
@@ -2931,14 +3045,20 @@
}
push @CONF, $l;
}
+ pop @CONF;
if( !$ismax )
{
- push @CONF, '$max_servers = '.$VSCount;
+ push @CONF, '$max_servers = '.$VSCount.";\n";
+ }
+ if( !$ismyhostname )
+ {
+ push @CONF, '$myhostname = '."'$myhostname';\n";
}
if( ! open(OUT,">$aconf.new") )
{
return "Error: $!";
}
+ push @CONF, '1;';
print OUT @CONF;
close(OUT);

@@ -3013,12 +3133,14 @@
'smtp_tls_per_site' =>
'(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))',
'access' =>
'(&(objectClass=suseMailAccess)(suseMailClient=%s))',
'local_recipient_maps'=>
'(&(objectClass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))',
- 'alias_maps' =>
'(&(objectClass=suseMailRecipient)(cn=%s))',
- 'alias_maps_member' =>
'(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToMember=yes))',
+ 'alias_maps' =>
'(&(objectClass=suseMailRecipient)(|(uid=%s)(cn=%s)))',
+ 'alias_maps_folder' =>
'(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToFolder=yes))',
'mynetworks' =>
'(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))',
'masquerade_domains' =>
'(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))',
'mydestination' =>
'(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))',
- 'virtual_alias_maps' =>
'(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))',
+ 'virtual_alias_maps_member' =>
'(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes))',
+ 'virtual_alias_maps' =>
'(&(objectclass=suseMailRecipient)(suseMailAcceptAddress=%s))',
+ 'virtual_alias_domains' =>
'(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))',
'canonical_maps' =>
'(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=both))',
'recipient_canonical_maps' =>
'(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))',
'sender_canonical_maps' =>
'(&(objectClass=suseCanonicalTable)(tableKey=%s)(valueType=sender))'
@@ -3028,12 +3150,14 @@
'smtp_tls_per_site' => 'suseTLSPerSiteMode',
'access' => 'suseMailAction',
'local_recipient_maps'=> 'uid',
- 'alias_maps' =>
'suseMailCommand,suseMailForwardAddress',
- 'alias_maps_member' => 'uid,suseMailForwardAddress',
+ 'alias_maps' => 'suseMailForwardAddress',
+ 'alias_maps_folder' => 'suseMailCommand',
'mynetworks' => 'suseMailClient',
'masquerade_domains' => 'zoneName',
'mydestination' => 'zoneName',
- 'virtual_alias_maps' => 'zoneName',
+ 'virtual_alias_maps_member' => 'uid',
+ 'virtual_alias_maps' => 'cn',
+ 'virtual_alias_domains' => 'zoneName',
'canonical_maps' => 'tableValue',
'recipient_canonical_maps' => 'tableValue',
'sender_canonical_maps' => 'tableValue'
@@ -3044,11 +3168,13 @@
'access' => 'one',
'local_recipient_maps'=> 'one',
'alias_maps' => 'one',
- 'alias_maps_member' => 'one',
+ 'alias_maps_folder' => 'one',
'mynetworks' => 'one',
'masquerade_domains' => 'sub',
'mydestination' => 'sub',
- 'virtual_alias_maps' => 'sub',
+ 'virtual_alias_maps_member' => 'one',
+ 'virtual_alias_maps' => 'one',
+ 'virtual_alias_domains' => 'sub',
'canonical_maps' => 'one',
'recipient_canonical_maps' => 'one',
'sender_canonical_maps' => 'one'
@@ -3058,18 +3184,20 @@
'smtp_tls_per_site' => $ldapMap->{'mail_config_dn'},
'access' => $ldapMap->{'mail_config_dn'},
'local_recipient_maps'=> $ldapMap->{'user_config_dn'},
- 'alias_maps' => $ldapMap->{'group_config_dn'},
- 'alias_maps_member' => $ldapMap->{'group_config_dn'},
+ 'alias_maps' => $ldapMap->{'ldap_domain'},
+ 'alias_maps_folder' => $ldapMap->{'group_config_dn'},
'mynetworks' => $ldapMap->{'mail_config_dn'},
'masquerade_domains' => $ldapMap->{'dns_config_dn'},
'mydestination' => $ldapMap->{'dns_config_dn'},
- 'virtual_alias_maps' => $ldapMap->{'dns_config_dn'},
+ 'virtual_alias_maps_member' =>
$ldapMap->{'group_config_dn'},
+ 'virtual_alias_maps' => $ldapMap->{'group_config_dn'},
+ 'virtual_alias_domains' =>
$ldapMap->{'dns_config_dn'},
'canonical_maps' => $ldapMap->{'mail_config_dn'},
'recipient_canonical_maps' =>
$ldapMap->{'mail_config_dn'},
'sender_canonical_maps' =>
$ldapMap->{'mail_config_dn'}
);
my %special_result_attribute = (
- 'alias_maps_member' => 'member',
+ 'virtual_alias_maps_member' => 'member',
);



Modified: branches/SuSE-Code-11-Branch/mail/src/mail-server_complex.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/src/mail-server_complex.ycp?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/src/mail-server_complex.ycp (original)
+++ branches/SuSE-Code-11-Branch/mail/src/mail-server_complex.ycp Sat Nov 21
15:04:46 2009
@@ -127,6 +127,8 @@
*/
symbol WriteDialog()
{
+ Wizard::CreateDialog ();
+ Wizard::SetDesktopIcon("mail");
Wizard::RestoreHelp(HELPS["write"]:"");
boolean ret = MailServer::Write();
return ret ? `next : `abort;

Modified: branches/SuSE-Code-11-Branch/mail/src/mail-server_dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/src/mail-server_dialogs.ycp?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/src/mail-server_dialogs.ycp (original)
+++ branches/SuSE-Code-11-Branch/mail/src/mail-server_dialogs.ycp Sat Nov 21
15:04:46 2009
@@ -658,7 +658,7 @@

term MailPreventionDialog(string CID, string CIDRBL)
{
- y2milestone("--Start MailTransportsDialog ---");
+ y2milestone("--Start MailPreventionDialog ---");
list<term> AccessItems= [];
list<term> RBLItems = [];
string BasicProtection =
(string)MailServer::MailPrevention["BasicProtection"]:"";
@@ -666,13 +666,12 @@
list<map<string,string> > AccessList = (list<map<string,string> >)
MailServer::MailPrevention["AccessList"]:[];
boolean VirusScanning =
(boolean)MailServer::MailPrevention["VirusScanning"]:false;
boolean SpamLearning =
(boolean)MailServer::MailPrevention["SpamLearning"]:false;
- integer VSCount =
(integer)MailServer::MailPrevention["VSCount"]:10;
+ integer VSCount = (integer)MailServer::MailPrevention["VSCount"]:5;
boolean BasicProtectionOff = false;
boolean BasicProtectionMedium = false;
boolean BasicProtectionHard = true;

-y2milestone("---- MailPrevention %1",MailServer::MailPrevention);
-y2milestone("---- VSCount %1",VSCount);
+ y2milestone("---- VSCount %1",VSCount);

if(BasicProtection == "off"){
BasicProtectionOff = true;
@@ -701,9 +700,9 @@
SpamL = `Left(`CheckBox (`id(`SpamLearning), `opt(`notify),
_("Configure Spam Learning Extension"), SpamLearning));
}
term content = `VBox (
- `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start
Virus Scanner AMAVIS"), VirusScanning)),
+ `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus
Scanner AMAVIS"), VirusScanning)),
`VSpacing (1),
- `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus
Scanner Process"), 1,50,VSCount)),
+ `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus
Scanner Process"), 1,50,VSCount)),
`VSpacing (1),
SpamL,
`VSpacing (1),
@@ -1349,6 +1348,10 @@
ret = event["ID"]:nil;
EventType = event["EventType"]:nil;

+y2milestone("event %1",event);
+y2milestone("event %1",ret);
+y2milestone("FocusedContent %1",FocusedContent);
+
if(ret == `cancel || ret == `abort ) {
if(ReallyAbort()) break;
else continue;
@@ -1427,7 +1430,7 @@
if( ret == `SpamLearning ) {
MailServer::MailPrevention["Changed"] = true;
UI::ChangeWidget(`id(`VirusScanning), `Value, true);
- UI::ChangeWidget(`id(`VSCount), `Value, 10);
+ UI::ChangeWidget(`id(`VSCount), `Value,
MailServer::MailPrevention["VSCount"]:"5");
continue;
}
if(ret == `RBLAdd) {
@@ -1655,9 +1658,6 @@
focus_changed = true;
FocusedContent ="MailLocalDomains";
}
-y2milestone("event %1",event);
-y2milestone("event %1",ret);
-y2milestone("FocusedContent %1",FocusedContent);
if(ret != `cancel && ret != `abort && ret != `next ) {
Wizard::SetContents(title, content ,helptext, false, true);
Wizard::SetDesktopIcon("mail");

Modified: branches/SuSE-Code-11-Branch/mail/src/suse-mailserver.schema
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/src/suse-mailserver.schema?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/src/suse-mailserver.schema (original)
+++ branches/SuSE-Code-11-Branch/mail/src/suse-mailserver.schema Sat Nov 21
15:04:46 2009
@@ -140,6 +140,12 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16}
SINGLE-VALUE )

+attributetype ( MailAT:22 NAME ( 'suseDeliveryToFolder' 'deliveryToFolder' )
+ DESC 'Shows if the member of the group the mails will get'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} )
+
##
## Objectclass Section
##
@@ -147,7 +153,7 @@
DESC 'represents an entry which is able to receive mail'
MAY ( suseMailAcceptAddress $ suseMailAlias $
suseVirtualAddress $ suseMailCommand $
- suseMailForwardAddress $ suseDeliveryToMember $ suseImapQuota) )
+ suseMailForwardAddress $ suseDeliveryToMember $ suseImapQuota $
suseDeliveryToFolder ) )

objectclass ( MailOC:2 NAME ( 'suseMailDomain' 'mailDomain' ) SUP top AUXILIARY
DESC 'To configure behaviour of mail domains'

Modified:
branches/SuSE-Code-11-Branch/mail/users-plugin/users_plugin_mail_groups.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/mail/users-plugin/users_plugin_mail_groups.ycp?rev=59680&r1=59679&r2=59680&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/mail/users-plugin/users_plugin_mail_groups.ycp
(original)
+++ branches/SuSE-Code-11-Branch/mail/users-plugin/users_plugin_mail_groups.ycp
Sat Nov 21 15:04:46 2009
@@ -145,17 +145,17 @@
list<term> result = [];
integer i = 0;

- if( is(data["suseMailForwardAaddress"]:(any)"", string)
- && size (data["suseMailForwardAaddress"]:"") > 0 )
+ if( is(data["suseMailForwardAddress"]:(any)"", string)
+ && size (data["suseMailForwardAddress"]:"") > 0 )
{
result = [`item (`id (i),
- data["suseMailForwardAaddress"]:"")];
+ data["suseMailForwardAddress"]:"")];
// transforming to list
- data["suseMailForwardAaddress"] =
[data["suseMailForwardAaddress"]:""];
+ data["suseMailForwardAddress"] =
[data["suseMailForwardAddress"]:""];
}
- else if ( is(data["suseMailForwardAaddress"]:(any)[], list) )
+ else if ( is(data["suseMailForwardAddress"]:(any)[], list) )
{
- foreach (string element,
data["suseMailForwardAaddress"]:[], ``{
+ foreach (string element,
data["suseMailForwardAddress"]:[], ``{
result = add (result, `item (`id (i), element));
i = i + 1;
});
@@ -169,12 +169,11 @@
string what = config["what"]:"user";
string action = data["what"]:"";

- if( data["suseMailCommand"]:"" != "" ) {
- sharedfolder = true;
- }
if( data["suseDeliveryToMember"]:"no" == "yes" ) {
deliverytomember = true;
- sharedfolder = false;
+ }
+ if( data["suseDeliveryToFolder"]:"no" == "yes" ) {
+ sharedfolder = true;
}

map<string, any> tmp_data = $[];
@@ -334,13 +333,13 @@
{
if (check_mail_address (emailName))
{
- if (contains (data["suseMailForwardAaddress"]:[],
emailName))
+ if (contains (data["suseMailForwardAddress"]:[],
emailName))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["suseMailForwardAaddress"] = add
(data["suseMailForwardAaddress"]:[],
+ data["suseMailForwardAddress"] = add
(data["suseMailForwardAddress"]:[],
emailName);
UI::ChangeWidget(`id(`table), `Items, getEMAILList
());
UI::ChangeWidget(`id(`id_emailname), `Value, "");
@@ -355,24 +354,24 @@
if (ret == `deleteEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table),
`CurrentItem);
- data["suseMailForwardAaddress"] = remove
(data["suseMailForwardAaddress"]:[],
+ data["suseMailForwardAddress"] = remove
(data["suseMailForwardAddress"]:[],
id);
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
if (ret == `editEmail)
{
integer id = (integer) UI::QueryWidget (`id (`table),
`CurrentItem);
- string oldEMAIL = (string)((list)
data["suseMailForwardAaddress"]:[])[id]:"";
+ string oldEMAIL = (string)((list)
data["suseMailForwardAddress"]:[])[id]:"";
string newEMAIL = editEMAIL (oldEMAIL);

- if (contains (data["suseMailForwardAaddress"]:[], newEMAIL))
+ if (contains (data["suseMailForwardAddress"]:[], newEMAIL))
{
Popup::Error(_("Entry already exists."));
}
else
{
- data["suseMailForwardAaddress"] = remove
(data["suseMailForwardAaddress"]:[], id);
- data["suseMailForwardAaddress"] = add
(data["suseMailForwardAaddress"]:[], newEMAIL);
+ data["suseMailForwardAddress"] = remove
(data["suseMailForwardAddress"]:[], id);
+ data["suseMailForwardAddress"] = add
(data["suseMailForwardAddress"]:[], newEMAIL);
}
UI::ChangeWidget(`id(`table), `Items, getEMAILList ());
}
@@ -385,13 +384,12 @@
}
// We put it everytime into the LDAP, and the ldap filter control if it is
visible
data["suseMailCommand"] = "\"|/usr/bin/formail -I \\\"From
\\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m
"+data["cn"]:""+"\"";
-// if( (boolean) UI::QueryWidget (`id (`sharedfolder), `Value)) {
-// data["suseMailCommand"] = "\"|/usr/bin/formail -I
\\\"From \\\" |/usr/lib/cyrus/bin/deliver -r "+data["cn"]:""+" -a cyrus -m
"+data["cn"]:""+"\"";
-// } else {
-// if( data["suseMailCommand"]:"" != "" ) {
-// data = remove (data, "suseMailCommand");
-// }
-// }
+ if( (boolean) UI::QueryWidget (`id (`sharedfolder), `Value)) {
+ data["suseDeliveryToFolder"] = "yes";
+ } else {
+ data["suseDeliveryToFolder"] = "no";
+ }
+
string err = UsersPluginMail::Check ( config,
(map<string,any>) union (data, tmp_data));

if (err != "")
@@ -407,10 +405,10 @@
data["plugins"] = add (data["plugins"]:[],
"UsersPluginMail");
}
- if( size(data["suseMailForwardAaddress"]:[]) == 1 ) {
- data["suseMailForwardAaddress"] =
((list)data["suseMailForwardAaddress"]:[])[0]:"";
- } else if( size(data["suseMailForwardAaddress"]:[]) == 0 ) {
- remove(data,"suseMailForwardAaddress");
+ if( size(data["suseMailForwardAddress"]:[]) == 1 ) {
+ data["suseMailForwardAddress"] =
((list)data["suseMailForwardAddress"]:[])[0]:"";
+ } else if( size(data["suseMailForwardAddress"]:[]) == 0 ) {
+ remove(data,"suseMailForwardAddress");
}

if(data["localdeliverytype"]:"local" == "cyrus" ) {

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

< Previous Next >
This Thread
  • No further messages