Hello community,
here is the log from the commit of package yast2-dhcp-server
checked in at Mon Sep 10 12:15:33 CEST 2007.
--------
--- yast2-dhcp-server/yast2-dhcp-server.changes 2007-07-10 13:57:37.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-dhcp-server/yast2-dhcp-server.changes 2007-09-07 19:55:17.995847000 +0200
@@ -1,0 +2,9 @@
+Fri Sep 7 19:51:44 CEST 2007 - kmachalkova@suse.cz
+
+- Do not use obsolete getcfg-interface to get network device name
+ from hw description (mac address) (#308258)
+- If hostname cannot be found, disable selecting LDAP support,
+ do not abort the module (#307019)
+- 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-2.15.4.tar.bz2
New:
----
yast2-dhcp-server-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.E15832/_old 2007-09-10 12:15:01.000000000 +0200
+++ /var/tmp/diff_new_pack.E15832/_new 2007-09-10 12:15:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dhcp-server (Version 2.15.4)
+# spec file for package yast2-dhcp-server (Version 2.15.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-dhcp-server
-Version: 2.15.4
+Version: 2.15.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dhcp-server-2.15.4.tar.bz2
+Source0: yast2-dhcp-server-2.15.5.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite
Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
@@ -40,7 +40,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-dhcp-server-2.15.4
+%setup -n yast2-dhcp-server-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,12 @@
/usr/share/YaST2/schema/autoyast/rnc/dhcp-server.rnc
%changelog
+* Fri Sep 07 2007 - kmachalkova@suse.cz
+- Do not use obsolete getcfg-interface to get network device name
+ from hw description (mac address) (#308258)
+- If hostname cannot be found, disable selecting LDAP support,
+ do not abort the module (#307019)
+- 2.15.5
* Tue Jul 10 2007 - kmachalkova@suse.cz
- Validate option vendor-class-identifier as quoted string (#143164)
- i18n: Marked strings for translation (#252103)
++++++ yast2-dhcp-server-2.15.4.tar.bz2 -> yast2-dhcp-server-2.15.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.4/src/DhcpServer.pm new/yast2-dhcp-server-2.15.5/src/DhcpServer.pm
--- old/yast2-dhcp-server-2.15.4/src/DhcpServer.pm 2007-05-18 10:56:51.000000000 +0200
+++ new/yast2-dhcp-server-2.15.5/src/DhcpServer.pm 2007-09-07 19:48:14.000000000 +0200
@@ -72,7 +72,7 @@
my $use_ldap = 0;
-my $ldap_available = 0;
+my $ldap_available = 1;
my $ldap_config_dn = "";
@@ -1338,6 +1338,12 @@
$self->SetModified ();
}
+BEGIN{$TYPEINFO{GetLdapAvailable} = ["function", "boolean"];}
+sub GetLdapAvailable {
+ my $self = shift;
+
+ return Boolean($ldap_available);
+}
BEGIN{$TYPEINFO{GetOtherOptions} = ["function", "string"];}
sub GetOtherOptions {
my $self = shift;
@@ -1455,9 +1461,10 @@
}
if (! (defined ($dhcp_server) && defined($dhcp_server_fqdn)))
{
- # error report, %1 is server name
-Report->Error (sformat(__("Cannot determine the hostname of %1."), $dhcp_server_fqdn));
- return 0;
+ # error report
+Report->Error (__("Cannot determine hostname. LDAP-based configuration of
+DHCP server will not be available."));
+ $ldap_available = 0;
}
# Firewall settings
@@ -1543,7 +1550,10 @@
$was_configured = 0;
}
- $self->LdapInit ($ag_settings_ref, 0);
+ if ( ! $ldap_available )
+ {
+ $self->LdapInit ($ag_settings_ref, 0);
+ }
if ( ! $use_ldap )
{
@@ -2218,26 +2228,26 @@
my $bcast = "";
my $netmask = "";
- y2milestone ("Getting information about interface $interface");
- my %out = %{SCR->Execute (".target.bash_output",
- "/sbin/getcfg-interface $interface") || {}};
- if ($out{"exit"} != 0)
- {
- y2error ("getcfg-interface exited with code $out{\"exit\"}");
- return {};
- }
- if ($out{"stdout"} eq "0")
- {
- y2error ("getcfg-interface returned strange interface \"0\"");
- return {};
- }
- my $iface = $out{"stdout"};
+ #y2milestone ("Getting information about interface $interface");
+ #my %out = %{SCR->Execute (".target.bash_output",
+ # "/sbin/getcfg-interface $interface") || {}};
+ #if ($out{"exit"} != 0)
+ #{
+ # y2error ("getcfg-interface exited with code $out{\"exit\"}");
+ # return {};
+ #}
+ #if ($out{"stdout"} eq "0")
+ #{
+ # y2error ("getcfg-interface returned strange interface \"0\"");
+ # return {};
+ #}
+ #my $iface = $out{"stdout"};
- %out = %{SCR->Execute (".target.bash_output",
- "LANG=en_EN /sbin/ifconfig $iface") || {}};
+ my %out = %{SCR->Execute (".target.bash_output",
+ "LANG=en_EN /sbin/ifconfig $interface") || {}};
if ($out{"exit"} != 0)
{
- y2error ("getcfg-interface exited with code $out{\"exit\"}");
+ y2error ("ifconfig exited with code $out{\"exit\"}");
return {};
}
@@ -2252,8 +2262,8 @@
}
else
{
- chomp($iface);
- y2warning ("ifconfig didn't return meaningful data about $iface, asking NetworkDevices");
+ chomp($interface);
+ y2warning ("ifconfig didn't return meaningful data about $interface, asking NetworkDevices");
$ip = NetworkDevices->GetValue($interface, "IPADDR");
$bcast = NetworkDevices->GetValue($interface, "BROADCAST");
$netmask = NetworkDevices->GetValue($interface, "NETMASK");
@@ -2272,7 +2282,7 @@
}
else
{
- y2error("Cannot get any data about $iface, it may have no configuration");
+ y2error("Cannot get any data about $interface, it may have no configuration");
return {};
}
@@ -2284,7 +2294,6 @@
my $settings_ref = shift;
my $report_errors = shift;
- $ldap_available = 0;
$use_ldap = 0;
my $configured_ldap = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.4/src/dialogs2.ycp new/yast2-dhcp-server-2.15.5/src/dialogs2.ycp
--- old/yast2-dhcp-server-2.15.4/src/dialogs2.ycp 2007-07-10 13:36:01.000000000 +0200
+++ new/yast2-dhcp-server-2.15.5/src/dialogs2.ycp 2007-09-07 19:51:39.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Vladimír Bobek
*
- * $Id: dialogs2.ycp 39273 2007-07-10 11:36:01Z kmachalkova $
+ * $Id: dialogs2.ycp 40814 2007-09-07 17:51:39Z kmachalkova $
*/
{
@@ -445,9 +445,15 @@
UI::ChangeWidget ( `id ("defaultleasetimeunits"), `Value, unit );
boolean ldap_in_use = DhcpServer::GetUseLdap();
- UI::ChangeWidget (`id ("ldap"), `Value, ldap_in_use);
- UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Value, DhcpServer::GetLdapDHCPServerCN());
- UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Enabled, ldap_in_use);
+ boolean ldap_available = DhcpServer::GetLdapAvailable();
+
+ if (ldap_available){
+ UI::ChangeWidget (`id ("ldap"), `Value, ldap_in_use);
+ UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Value, DhcpServer::GetLdapDHCPServerCN());
+ UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Enabled, ldap_in_use);
+ }
+ else
+ UI::ChangeWidget (`id ("ldap"), `Enabled, ldap_available);
GlobalSettingsValidChars ();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.4/src/widgets.ycp new/yast2-dhcp-server-2.15.5/src/widgets.ycp
--- old/yast2-dhcp-server-2.15.4/src/widgets.ycp 2007-05-18 10:56:51.000000000 +0200
+++ new/yast2-dhcp-server-2.15.5/src/widgets.ycp 2007-09-07 19:51:39.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets
* Authors: Jiri Srain
*
- * $Id: widgets.ycp 35307 2007-01-12 15:15:37Z kmachalkova $
+ * $Id: widgets.ycp 40814 2007-09-07 17:51:39Z kmachalkova $
*/
{
@@ -270,8 +270,13 @@
*/
global define void ldapInit (string id) ``{
boolean ul = DhcpServer::GetUseLdap();
+ boolean ldap_available = DhcpServer::GetLdapAvailable();
UI::ChangeWidget (`id (id), `Value, ul);
- ldapHandle (id, $[ "ID" : "start" ]);
+
+ if (ldap_available)
+ ldapHandle (id, $[ "ID" : "start" ]);
+ else
+ UI::ChangeWidget (`id (id), `Enabled, ldap_available);
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.4/VERSION new/yast2-dhcp-server-2.15.5/VERSION
--- old/yast2-dhcp-server-2.15.4/VERSION 2007-07-10 13:54:43.000000000 +0200
+++ new/yast2-dhcp-server-2.15.5/VERSION 2007-09-07 19:47:57.000000000 +0200
@@ -1 +1 @@
-2.15.4
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
