Author: locilka Date: Fri Jan 23 18:40:03 2009 New Revision: 54960 URL: http://svn.opensuse.org/viewcvs/yast?rev=54960&view=rev Log: - Fixed displaying an error pop-up if 'Set Use LDAP' fails (bnc #181241) - 2.18.1 Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm trunk/dns-server/src/dialog-installwizard.ycp trunk/dns-server/src/dialog-main.ycp Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=54960&r1=54959&r2=54960&view=diff ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Fri Jan 23 18:40:03 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-server.changes?rev=54960&r1=54959&r2=54960&view=diff ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Jan 23 18:40:03 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 23 18:37:17 CET 2009 - locilka@suse.cz + +- Fixed displaying an error pop-up if 'Set Use LDAP' fails + (bnc #181241) +- 2.18.1 + +------------------------------------------------------------------- Tue Jan 20 16:08:40 CET 2009 - locilka@suse.cz - Allowing IPv6 address to be used as DNS Server forwarder Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=54960&r1=54959&r2=54960&view=diff ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Fri Jan 23 18:40:03 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: trunk/dns-server/src/dialog-installwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-installwizard.ycp?rev=54960&r1=54959&r2=54960&view=diff ============================================================================== --- trunk/dns-server/src/dialog-installwizard.ycp (original) +++ trunk/dns-server/src/dialog-installwizard.ycp Fri Jan 23 18:40:03 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: trunk/dns-server/src/dialog-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-main.ycp?rev=54960&r1=54959&r2=54960&view=diff ============================================================================== --- trunk/dns-server/src/dialog-main.ycp (original) +++ trunk/dns-server/src/dialog-main.ycp Fri Jan 23 18:40:03 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org