Mailinglist Archive: yast-commit (819 mails)

< Previous Next >
[yast-commit] r54959 - in /branches/SuSE-Code-11-Branch/dns-server: VERSION package/yast2-dns-server.changes src/DnsServer.pm src/dialog-installwizard.ycp src/dialog-main.ycp
  • From: locilka@xxxxxxxxxxxxxxxx
  • Date: Fri, 23 Jan 2009 17:39:50 -0000
  • Message-id: <E1LQQ0U-000679-W3@xxxxxxxxxxxxxxxx>
Author: locilka
Date: Fri Jan 23 18:39:50 2009
New Revision: 54959

URL: http://svn.opensuse.org/viewcvs/yast?rev=54959&view=rev
Log:
- Fixed displaying an error pop-up if 'Set Use LDAP' fails
(bnc #181241)
- 2.17.10


Modified:
branches/SuSE-Code-11-Branch/dns-server/VERSION
branches/SuSE-Code-11-Branch/dns-server/package/yast2-dns-server.changes
branches/SuSE-Code-11-Branch/dns-server/src/DnsServer.pm
branches/SuSE-Code-11-Branch/dns-server/src/dialog-installwizard.ycp
branches/SuSE-Code-11-Branch/dns-server/src/dialog-main.ycp

Modified: branches/SuSE-Code-11-Branch/dns-server/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/dns-server/VERSION?rev=54959&r1=54958&r2=54959&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/dns-server/VERSION (original)
+++ branches/SuSE-Code-11-Branch/dns-server/VERSION Fri Jan 23 18:39:50 2009
@@ -1 +1 @@
-2.17.9
+2.17.10

Modified:
branches/SuSE-Code-11-Branch/dns-server/package/yast2-dns-server.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/dns-server/package/yast2-dns-server.changes?rev=54959&r1=54958&r2=54959&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/dns-server/package/yast2-dns-server.changes
(original)
+++ branches/SuSE-Code-11-Branch/dns-server/package/yast2-dns-server.changes
Fri Jan 23 18:39:50 2009
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Jan 23 18:37:17 CET 2009 - locilka@xxxxxxx
+
+- Fixed displaying an error pop-up if 'Set Use LDAP' fails
+ (bnc #181241)
+- 2.17.10
+
+-------------------------------------------------------------------
Tue Nov 18 13:42:01 CET 2008 - locilka@xxxxxxx

- Added missing help text (bnc #436456).

Modified: branches/SuSE-Code-11-Branch/dns-server/src/DnsServer.pm
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/dns-server/src/DnsServer.pm?rev=54959&r1=54958&r2=54959&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/dns-server/src/DnsServer.pm (original)
+++ branches/SuSE-Code-11-Branch/dns-server/src/DnsServer.pm Fri Jan 23
18:39:50 2009
@@ -641,14 +641,14 @@
return $start_service;
}

-BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "void", "boolean" ];}
+BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];}
sub SetUseLdap {
my $self = shift;
$use_ldap = shift;

if ($use_ldap) {
# trying init LDAP if use_ldap selected
- my $success = $self->LdapInit (1);
+ my $success = $self->LdapInit (1, 1);

if (!$success) {
return 0;
@@ -948,7 +948,7 @@
}

# if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "expert") {
- $self->LdapInit (0);
+ $self->LdapInit (0, 0);
# }

Progress->NextStage ();
@@ -1488,7 +1488,7 @@
{
# Initialize LDAP if needed
$self->InitYapiConfigOptions ({"use_ldap" => $use_ldap});
- $self->LdapInit (0);
+ $self->LdapInit (0, 0);
$self->CleanYapiConfigOptions ();
}

@@ -1555,11 +1555,11 @@
return \@ret;
}

-BEGIN { $TYPEINFO{LdapInit} = ["function", "boolean", "boolean" ]; }
+BEGIN { $TYPEINFO{LdapInit} = ["function", "boolean", "boolean", "boolean" ]; }
sub LdapInit {
my $self = shift;
- my $ask_user_to_enable_ldap = shift;
- my $report_errors = shift || 0;
+ my $ask_user_to_enable_ldap = shift || 0;
+ my $report_errors = shift || 0;

$ldap_available = 0;
$use_ldap = 0;
@@ -1770,7 +1770,7 @@
}

# connect to the LDAP server
- my $ret = Ldap->LDAPInit ();
+ my $ret = Ldap->LDAPInit (0, 0);
if ($ret ne "")
{
Ldap->LDAPErrorMessage ("init", $ret);

Modified: branches/SuSE-Code-11-Branch/dns-server/src/dialog-installwizard.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/dns-server/src/dialog-installwizard.ycp?rev=54959&r1=54958&r2=54959&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/dns-server/src/dialog-installwizard.ycp
(original)
+++ branches/SuSE-Code-11-Branch/dns-server/src/dialog-installwizard.ycp Fri
Jan 23 18:39:50 2009
@@ -258,10 +258,13 @@
{
boolean use_ldap = (boolean)
UI::QueryWidget (`id ("use_ldap"), `Value);
- DnsServer::SetUseLdap (use_ldap);
- DnsServer::InitYapiConfigOptions ($["use_ldap" : use_ldap]);
- DnsServer::LdapInit (true);
- DnsServer::CleanYapiConfigOptions ();
+
+ if (DnsServer::SetUseLdap (use_ldap)) {
+ DnsServer::InitYapiConfigOptions ($["use_ldap" : use_ldap]);
+ DnsServer::LdapInit (true, true);
+ DnsServer::CleanYapiConfigOptions ();
+ }
+
use_ldap = DnsServer::GetUseLdap ();
UI::ChangeWidget (`id ("use_ldap"), `Value, use_ldap);
}

Modified: branches/SuSE-Code-11-Branch/dns-server/src/dialog-main.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/dns-server/src/dialog-main.ycp?rev=54959&r1=54958&r2=54959&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/dns-server/src/dialog-main.ycp (original)
+++ branches/SuSE-Code-11-Branch/dns-server/src/dialog-main.ycp Fri Jan 23
18:39:50 2009
@@ -185,11 +185,12 @@
// return nil;
// }
boolean use_ldap = (boolean)UI::QueryWidget (`id ("use_ldap"), `Value);
- DnsServer::SetUseLdap (use_ldap);
- if (! Mode::config ())
+ boolean successful = DnsServer::SetUseLdap (use_ldap);
+ if (successful && ! Mode::config ())
{
DnsServer::InitYapiConfigOptions ($["use_ldap" : use_ldap]);
- DnsServer::LdapInit (true);
+ // error reported in SetUseLdap
+ DnsServer::LdapInit (true, false);
DnsServer::CleanYapiConfigOptions ();
}
use_ldap = DnsServer::GetUseLdap ();

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

< Previous Next >
This Thread
  • No further messages