Hello community, here is the log from the commit of package yast2-dns-server checked in at Tue Aug 12 00:30:30 CEST 2008. -------- --- yast2-dns-server/yast2-dns-server.changes 2008-08-06 15:56:00.000000000 +0200 +++ yast2-dns-server/yast2-dns-server.changes 2008-08-11 13:17:16.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 11 11:49:45 CEST 2008 - locilka@suse.cz + +- Using netconfig to configure DNS forwarders (patch created by + sschober@suse.de) (FATE #303386). +- Package sysconfig is newly required (because of /sbin/netconfig). +- Adjusted testsuites. +- 2.17.6 + +------------------------------------------------------------------- Old: ---- yast2-dns-server-2.17.5.tar.bz2 New: ---- yast2-dns-server-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.s29023/_old 2008-08-12 00:26:34.000000000 +0200 +++ /var/tmp/diff_new_pack.s29023/_new 2008-08-12 00:26:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dns-server (Version 2.17.5) +# spec file for package yast2-dns-server (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-dns-server -Version: 2.17.5 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dns-server-2.17.5.tar.bz2 +Source0: yast2-dns-server-2.17.6.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite # requires DnsServerAPI::GetReverseIPforIPv6 @@ -39,6 +39,9 @@ Requires: bind-utils Requires: yast2-ldap Requires: yast2-ldap-client +# Script /sbin/netconfig 0.71.2+? +# FATE #303386: Network setup tools +Requires: yast2-sysconfig # DnsServerApi moved to yast2.rpm (bnc#392606) # DnsServerAPI::GetReverseIPforIPv6 Requires: yast2 >= 2.17.8 @@ -56,7 +59,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-dns-server-2.17.5 +%setup -n yast2-dns-server-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -99,6 +102,12 @@ /usr/share/YaST2/schema/autoyast/rnc/dns-server.rnc %doc %{prefix}/share/doc/packages/yast2-dns-server %changelog +* Mon Aug 11 2008 locilka@suse.cz +- Using netconfig to configure DNS forwarders (patch created by + sschober@suse.de) (FATE #303386). +- Package sysconfig is newly required (because of /sbin/netconfig). +- Adjusted testsuites. +- 2.17.6 * Wed Aug 06 2008 locilka@suse.cz - DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback when hostname --fqdn returns empty string (bnc #403468). ++++++ yast2-dns-server-2.17.5.tar.bz2 -> yast2-dns-server-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/configure new/yast2-dns-server-2.17.6/configure --- old/yast2-dns-server-2.17.5/configure 2008-08-06 16:16:15.000000000 +0200 +++ new/yast2-dns-server-2.17.6/configure 2008-08-11 13:18:30.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-dns-server 2.17.5. +# Generated by GNU Autoconf 2.61 for yast2-dns-server 2.17.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-dns-server' PACKAGE_TARNAME='yast2-dns-server' -PACKAGE_VERSION='2.17.5' -PACKAGE_STRING='yast2-dns-server 2.17.5' +PACKAGE_VERSION='2.17.6' +PACKAGE_STRING='yast2-dns-server 2.17.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-dns-server 2.17.5 to adapt to many kinds of systems. +\`configure' configures yast2-dns-server 2.17.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-dns-server 2.17.5:";; + short | recursive ) echo "Configuration of yast2-dns-server 2.17.6:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-dns-server configure 2.17.5 +yast2-dns-server configure 2.17.6 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-dns-server $as_me 2.17.5, which was +It was created by yast2-dns-server $as_me 2.17.6, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-dns-server' - VERSION='2.17.5' + VERSION='2.17.6' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.5" +VERSION="2.17.6" RPMNAME="yast2-dns-server" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-dns-server $as_me 2.17.5, which was +This file was extended by yast2-dns-server $as_me 2.17.6, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-dns-server config.status 2.17.5 +yast2-dns-server config.status 2.17.6 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/configure.in new/yast2-dns-server-2.17.6/configure.in --- old/yast2-dns-server-2.17.5/configure.in 2008-08-06 16:16:11.000000000 +0200 +++ new/yast2-dns-server-2.17.6/configure.in 2008-08-11 13:18:28.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dns-server, 2.17.5, http://bugs.opensuse.org/, yast2-dns-server) +AC_INIT(yast2-dns-server, 2.17.6, http://bugs.opensuse.org/, yast2-dns-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.5" +VERSION="2.17.6" RPMNAME="yast2-dns-server" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/src/dialog-main.ycp new/yast2-dns-server-2.17.6/src/dialog-main.ycp --- old/yast2-dns-server-2.17.5/src/dialog-main.ycp 2008-07-23 17:45:57.000000000 +0200 +++ new/yast2-dns-server-2.17.6/src/dialog-main.ycp 2008-08-11 12:34:58.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain@suse.cz> * Lukas Ocilka <lukas.ocilka@suse.cz> * - * $Id: dialog-main.ycp 49367 2008-07-23 14:45:56Z locilka $ + * $Id: dialog-main.ycp 49923 2008-08-11 10:34:57Z locilka $ */ { @@ -206,6 +206,7 @@ `VBox ( // label `VBox ( + /* `RadioButtonGroup( `id ( "who_sets_forwarder" ), `VBox ( // Radiobutton DNS-Forwarders @@ -214,6 +215,17 @@ `Left( `RadioButton( `id ( "manually_forwarder" ), _("Set Forwarders &Manually"), true ) ) ) ) + */ + `HBox( + `ComboBox( `id( "forwarder_policy" ), `opt(`notify), + _("Netconfig DNS policy"), + [ `item( `id(`nomodify), "disable" ), + `item( `id(`auto), "auto"), + `item( `id(`static), "static"), + `item( `id(`custom), "custom" )]), + `HSpacing(1), + `InputField (`id( "custom_policy"), `opt (`hstretch), _("Custom policy")) + ) ), `VSpacing ( 1 ), // Frame label for DNS-Forwarders options @@ -264,9 +276,12 @@ // Selectionbox for listing current DNS-Forwarders _("Forwarder &List"), forwarders)); + boolean enabled = ( `nomodify != (symbol) + UI::QueryWidget(`id("forwarder_policy"), `Value)); UI::ChangeWidget (`id ("forwarders_delete_ip_address"), - `Enabled, forwarders != []); - if (forwarders != []) + `Enabled, forwarders != [] && enabled ); + UI::ChangeWidget (`id ("forwarders_list"),`Enabled, enabled ); + if (forwarders != [] && enabled) { UI::ChangeWidget (`id ("forwarders_list"), `CurrentItem, forwarders[0]:""); @@ -300,11 +315,38 @@ UI::ChangeWidget( `id("forwarders_new_ip_address"), `ValidChars, IP::ValidChars4); } +void handlePolicy( symbol policy ){ + if( `nomodify == policy ){ + UI::ChangeWidget( `id("custom_policy"), `Enabled, false ); + UI::ChangeWidget( `id("custom_policy"), `Value, "" ); + UI::ChangeWidget( `id("forwarders_new_ip_address"), `Enabled, false ); + UI::ChangeWidget( `id("forwarders_add_ip_address"), `Enabled, false ); + } + else{ + if( `custom == policy ){ + UI::ChangeWidget( `id("custom_policy"), `Enabled, true ); + /* preinitialize with STATIC */ + UI::ChangeWidget( `id("custom_policy"), `Value, "STATIC" ); + } + else{ + if( `static == policy ){ + UI::ChangeWidget( `id("custom_policy"), `Value, "STATIC" ); + } + else if ( `auto == policy ){ + UI::ChangeWidget( `id("custom_policy"), `Value, "auto" ); + } + UI::ChangeWidget( `id("custom_policy"), `Enabled, false ); + } + UI::ChangeWidget( `id("forwarders_new_ip_address"), `Enabled, true ); + UI::ChangeWidget( `id("forwarders_add_ip_address"), `Enabled, true ); + } +} /** * Initialize the tab of the dialog */ void InitExpertForwardersPage (string key) { SetDNSSErverIcon(); + /* if (DnsServer::GetModifyNamedConfDynamically ()) { UI::ChangeWidget (`id ("who_sets_forwarder"), `CurrentButton, "ppp_forwarder"); @@ -313,6 +355,24 @@ { UI::ChangeWidget (`id ("who_sets_forwarder"), `CurrentButton, "manually_forwarder"); } + */ + UI::ChangeWidget( `id("custom_policy"), `Enabled, false); + string policy = DnsServer::GetNetconfigDNSPolicy(); + symbol policy_symb = `Empty; + if (policy == nil || policy == "" ){ + policy_symb = `nomodify; + } + else if (policy == "auto" || policy == "STATIC *" ){ + policy_symb = `auto; + } + else if (policy == "STATIC"){ + policy_symb = `static; + } + else{ + policy_symb = `custom; + } + UI::ChangeWidget( `id("forwarder_policy"), `Value, policy_symb ); + handlePolicy( policy_symb ); ReadForwarders (); RedrawForwardersListWidget (); ValidCharsForwardersPage (); @@ -322,6 +382,7 @@ * Store settings of a tab of a dialog */ void StoreExpertForwardersPage (string key, map event) { +/* if (UI::QueryWidget (`id ("who_sets_forwarder"), `CurrentButton) == "ppp_forwarder") { @@ -333,6 +394,21 @@ DnsServer::SetModifyNamedConfDynamically (false); DnsServer::SetModifyResolvConfDynamically (true); } +*/ + symbol policy = (symbol) UI::QueryWidget( `id("forwarder_policy"), `Value ); + if( `custom == policy ){ + DnsServer::SetNetconfigDNSPolicy( (string) UI::QueryWidget( `id("custom_policy"), `Value )); + } + else if( `auto == policy ){ + DnsServer::SetNetconfigDNSPolicy( "auto" ); + } + else if( `static == policy ){ + DnsServer::SetNetconfigDNSPolicy( "STATIC" ); + } + else{ + DnsServer::SetNetconfigDNSPolicy( "" ); + } + list<map<string,any> > options = DnsServer::GetGlobalOptions (); options = filter (map<string,any> o, options, { return o["key"]:"" != "forwarders"/* && o["key"]:"" != "forward"*/; @@ -380,6 +456,9 @@ y2error ("DA: %1", old_addr); forwarders = filter (string f, forwarders, ``(f != old_addr)); } + else if (ret == "forwarder_policy" ){ + handlePolicy( (symbol) UI::QueryWidget( `id("forwarder_policy"), `Value)); + } RedrawForwardersListWidget (); return nil; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/src/DnsServer.pm new/yast2-dns-server-2.17.6/src/DnsServer.pm --- old/yast2-dns-server-2.17.5/src/DnsServer.pm 2008-08-06 15:40:35.000000000 +0200 +++ new/yast2-dns-server-2.17.6/src/DnsServer.pm 2008-08-11 13:02:05.000000000 +0200 @@ -62,9 +62,11 @@ my %yapi_conf = (); -my $modify_named_conf_dynamically = 0; +#my $modify_named_conf_dynamically = 0; -my $modify_resolv_conf_dynamically = 0; +#my $modify_resolv_conf_dynamically = 0; + +my $netconfig_dns_policy = 0; my @acl = (); @@ -414,12 +416,12 @@ # remove them from options because they will be written into single file push @del_options, "forwarders"; # if forwarders are not included - my $forwarders_include_record = "\"".$forwarders_include."\""; - if (scalar (grep { $_->{"key"} eq "include" && $_->{"value"} eq $forwarders_include_record } @options ) == 0) { +# my $forwarders_include_record = "\"".$forwarders_include."\""; +# if (scalar (grep { $_->{"key"} eq "include" && $_->{"value"} eq $forwarders_include_record } @options ) == 0) { # include them - y2milestone("Moving forwarders into single file ".$forwarders_include); - push @options, { "key" => "include", "value" => $forwarders_include_record }; - } +# y2milestone("Moving forwarders into single file ".$forwarders_include); +# push @options, { "key" => "include", "value" => $forwarders_include_record }; +# } # } foreach my $o (@del_options) @@ -450,14 +452,19 @@ if (defined @{$opt_map{$key}}[0] && @{$opt_map{$key}}[0] ne "") { $forwarders_found = 1; # writing forwarders into single file - SCR->Write (".dns.named-forwarders", [$forwarders_include, @{$opt_map{$key}}[0]]); + #SCR->Write (".dns.named-forwarders", [$forwarders_include, @{$opt_map{$key}}[0]]); + my $fwd_list = @{$opt_map{$key}}[0]; + $fwd_list =~ s/[\{,\}, ]//g; + $fwd_list = join(" ", split (/;/, $fwd_list)); + SCR->Write(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS", $fwd_list); + y2milestone( "Wrote NETCONFIG_DNS_STATIC_SERVERS: ".$fwd_list); } } } # forwarders not defined, but they must be at least empty - if (!$forwarders_found) { - SCR->Write (".dns.named-forwarders", [$forwarders_include, "{}"]); - } +# if (!$forwarders_found) { +# SCR->Write (".dns.named-forwarders", [$forwarders_include, "{}"]); +# } # delete all removed logging options my @old_logging = (); @@ -810,34 +817,48 @@ return 0; } -BEGIN{$TYPEINFO{GetModifyNamedConfDynamically} = ["function","boolean"];} -sub GetModifyNamedConfDynamically { - my $self = shift; - - return $modify_named_conf_dynamically; -} +#BEGIN{$TYPEINFO{GetModifyNamedConfDynamically} = ["function","boolean"];} +#sub GetModifyNamedConfDynamically { +# my $self = shift; +# +# return $modify_named_conf_dynamically; +#} -BEGIN{$TYPEINFO{SetModifyNamedConfDynamically} = ["function","void","boolean"];} -sub SetModifyNamedConfDynamically { - my $self = shift; - $modify_named_conf_dynamically = shift; - $self->SetModified (); -} +#BEGIN{$TYPEINFO{SetModifyNamedConfDynamically} = ["function","void","boolean"];} +#sub SetModifyNamedConfDynamically { +# my $self = shift; +# $modify_named_conf_dynamically = shift; +# $self->SetModified (); +#} -BEGIN{$TYPEINFO{GetModifyResolvConfDynamically} = ["function","boolean"];} -sub GetModifyResolvConfDynamically { +BEGIN{$TYPEINFO{GetNetconfigDNSPolicy} = ["function","string"];} +sub GetNetconfigDNSPolicy{ my $self = shift; - return $modify_resolv_conf_dynamically; + return $netconfig_dns_policy; } -BEGIN{$TYPEINFO{SetModifyResolvConfDynamically} = ["function","void","boolean"];} -sub SetModifyResolvConfDynamically { +BEGIN{$TYPEINFO{SetNetconfigDNSPolicy} = ["function","void","string"];} +sub SetNetconfigDNSPolicy{ my $self = shift; - $modify_resolv_conf_dynamically = shift; + $netconfig_dns_policy= shift; $self->SetModified (); } +#BEGIN{$TYPEINFO{GetModifyResolvConfDynamically} = ["function","boolean"];} +#sub GetModifyResolvConfDynamically { +# my $self = shift; +# +# return $modify_resolv_conf_dynamically; +#} +# +#BEGIN{$TYPEINFO{SetModifyResolvConfDynamically} = ["function","void","boolean"];} +#sub SetModifyResolvConfDynamically { +# my $self = shift; +# $modify_resolv_conf_dynamically = shift; +# $self->SetModified (); +#} + BEGIN{$TYPEINFO{GetAcl} = ["function",["list","string"]];} sub GetAcl { my $self = shift; @@ -960,18 +981,21 @@ : 0; y2milestone ("Chroot: $chroot"); - $modify_named_conf_dynamically = SCR->Read ( - ".sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY") || "no"; - $modify_named_conf_dynamically = $modify_named_conf_dynamically eq "yes" - ? 1 - : 0; - - $modify_resolv_conf_dynamically = SCR->Read ( - ".sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY") || "no"; - $modify_resolv_conf_dynamically = $modify_resolv_conf_dynamically eq "yes" - ? 1 - : 0; +# $modify_named_conf_dynamically = SCR->Read ( +# ".sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY") || "no"; +# $modify_named_conf_dynamically = $modify_named_conf_dynamically eq "yes" +# ? 1 +# : 0; +# +# $modify_resolv_conf_dynamically = SCR->Read ( +# ".sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY") || "no"; +# $modify_resolv_conf_dynamically = $modify_resolv_conf_dynamically eq "yes" +# ? 1 +# : 0; + $netconfig_dns_policy = SCR->Read(".sysconfig.network.config.NETCONFIG_DNS_POLICY") || ""; + y2milestone ("NETCONFIG_DNS_POLICY: $netconfig_dns_policy"); + my @zone_headers = @{SCR->Dir (".dns.named.section") || []}; @zone_headers = grep (/^zone/, @zone_headers); y2milestone ("Read zone headers @zone_headers"); @@ -991,14 +1015,14 @@ @opt_names = sort (keys (%opt_hash)); my $forwarders_in_options = ""; - + my $forwarders_value = ""; my $forwarders_include_record = "\"".$forwarders_include."\""; foreach $key (@opt_names) { my @values = @{SCR->Read (".dns.named.value.options.$key") || []}; foreach my $value (@values) { if ($key eq "forwarders") { - $forwarders_in_options = $value; +# $forwarders_in_options = $value; next; } push @options, { @@ -1007,15 +1031,18 @@ }; if ($key eq "include" && $value eq $forwarders_include_record) { $include_defined_in_conf = 1; - $forwarders_value = SCR->Read (".dns.named-forwarders", $forwarders_include) || ""; +# $forwarders_value = SCR->Read (".dns.named-forwarders", $forwarders_include) || ""; } } } + $forwarders_value = SCR->Read(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS") || ""; + $forwarders_value = join("; ", split( " ", $forwarders_value)); + y2milestone ("NETCONFIG_DNS_STATIC_SERVERS: $forwarders_value"); # no forwarders are defined in single file or file doesn't exist # but forwarders are defined right in options - if (!$forwarders_value && $forwarders_in_options) { - $forwarders_value = $forwarders_in_options; - } +# if (!$forwarders_value && $forwarders_in_options) { +# $forwarders_value = $forwarders_in_options; +# } push @options, { "key" => "forwarders", "value" => $forwarders_value, }; @logging = (); @@ -1179,7 +1206,7 @@ # DNS server read dialog caption my $caption = __("Saving DNS Server Configuration"); - Progress->New( $caption, " ", 6, [ + Progress->New( $caption, " ", 7, [ # progress stage __("Flush caches of the DNS daemon"), # progress stage @@ -1191,6 +1218,8 @@ # progress stage __("Adjust the DNS service"), # progress stage + __("Call netconfig"), + # progress stage __("Write the firewall settings") ], [ @@ -1205,6 +1234,8 @@ # progress step __("Adjusting the DNS service..."), # progress step + __("Calling netconfig..."), + # progress step __("Writing the firewall settings..."), # progress step __("Finished") @@ -1290,11 +1321,14 @@ SCR->Write (".sysconfig.named.NAMED_RUN_CHROOTED", $chroot ? "yes" : "no"); SCR->Write (".sysconfig.named", undef); - SCR->Write (".sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY", - $modify_named_conf_dynamically ? "yes" : "no"); - SCR->Write (".sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY", - $modify_resolv_conf_dynamically ? "yes" : "no"); - SCR->Write (".sysconfig.network.config", undef); +# SCR->Write (".sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY", +# $modify_named_conf_dynamically ? "yes" : "no"); +# SCR->Write (".sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY", +# $modify_resolv_conf_dynamically ? "yes" : "no"); + + # Store the NETCONFIG_DNS_POLICY + # Note: NETCONFIG_DNS_STATIC_SERVERS is stored in SaveGlobals(); + SCR->Write (".sysconfig.network.config.NETCONFIG_DNS_POLICY", $netconfig_dns_policy); # set to sysconfig if LDAP is to be used # set the sysconfig also if LDAP is not to be used (bug #165189) @@ -1333,11 +1367,11 @@ } Progress->NextStage (); - + my $forwarder = "resolver"; + $ret = {}; # named has to be started if ($start_service) { - my $ret = {}; $ret->{'exit'} = 0; if (! $write_only) { @@ -1349,6 +1383,8 @@ y2milestone("Restarting service 'named'"); $ret = SCR->Execute (".target.bash_output", "/etc/init.d/named restart"); } + # 'named' is running. Set dns forwarder to 'bind'. + $forwarder="bind"; } Service->Enable ("named"); if ($ret->{'exit'} != 0) @@ -1356,6 +1392,8 @@ # Cannot start service 'named', because of error that follows Error:. Do not translate named. Report->Error (__("Error occurred while starting service named.\nError: ".$ret->{'stdout'})); $ok = 0; + # There's no 'named' running. Reset dns forwarder again + $forwarder = "resolver"; } } # named has to be stopped @@ -1365,6 +1403,8 @@ { y2milestone("Stopping service 'named'"); SCR->Execute (".target.bash", "/etc/init.d/named stop"); + # There's no 'named' running. Reset dns forwarder again + $forwarder = "resolver"; } Service->Disable ("named"); } @@ -1374,6 +1414,20 @@ # FIXME when YaST settings are needed SCR->Write (".target.ycp", Directory->vardir() . "/dns_server", {}); } + + Progress->NextStage (); + + y2milestone("Setting dns forwarder: $forwarder"); + SCR->Write (".sysconfig.network.config.NETCONFIG_DNS_FORWARDER",$forwarder); + SCR->Write (".sysconfig.network.config", undef); + + y2milestone("Calling netconfig"); + $ret->{'exit'} = 0; + $ret = SCR->Execute (".target.bash_output", "/sbin/netconfig update"); + if ($ret->{'exit'} != 0) + { + Report->Error (__("Error occurred while calling netconfig.\nError: ".$ret->{'stdout'})); + } Progress->NextStage (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/src/helps.ycp new/yast2-dns-server-2.17.6/src/helps.ycp --- old/yast2-dns-server-2.17.5/src/helps.ycp 2008-07-23 15:16:25.000000000 +0200 +++ new/yast2-dns-server-2.17.6/src/helps.ycp 2008-08-11 12:34:58.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jiri.srain@suse.cz>, * Lukas Ocilka <lukas.ocilka@suse.cz> * - * $Id: helps.ycp 49340 2008-07-23 12:16:18Z locilka $ + * $Id: helps.ycp 49923 2008-08-11 10:34:57Z locilka $ */ { @@ -194,11 +194,7 @@ /* Expert Mode Configuration - Forwarders 1/3 */ "forwarders" : _("<p><b><big>Forwarders</big></b><br> Forwarders are DNS servers to which your DNS server should send queries -it cannot answer. -For a dial-up connection, it can be useful -to allow the PPP daemon to update the forwarders after the connection -is established. For this, select <b>PPP Daemon Sets Forwarders</b>. To update forwarders -only manually, select <b>Set Forwarders Manually</b>.</p> +it cannot answer.</p> ") + /* Expert Mode Configuration - Forwarders 2/3 */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/DnsServerAPI.out new/yast2-dns-server-2.17.6/testsuite/tests/DnsServerAPI.out --- old/yast2-dns-server-2.17.5/testsuite/tests/DnsServerAPI.out 2008-06-19 15:11:01.000000000 +0200 +++ new/yast2-dns-server-2.17.6/testsuite/tests/DnsServerAPI.out 2008-08-11 12:47:03.000000000 +0200 @@ -13,12 +13,12 @@ Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil -Read .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" -Read .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" +Read .sysconfig.network.config.NETCONFIG_DNS_POLICY "auto" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Dir .dns.named.value.options: ["directory", "notify"] Read .dns.named.value.options.directory ["\"/var/lib/named\""] Read .dns.named.value.options.notify ["no"] +Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "1.2.3.4" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Read .dns.named.value.acl [] Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/DnsServerAPI.ycp new/yast2-dns-server-2.17.6/testsuite/tests/DnsServerAPI.ycp --- old/yast2-dns-server-2.17.5/testsuite/tests/DnsServerAPI.ycp 2008-06-19 15:11:01.000000000 +0200 +++ new/yast2-dns-server-2.17.6/testsuite/tests/DnsServerAPI.ycp 2008-08-11 12:47:16.000000000 +0200 @@ -110,6 +110,8 @@ "config" : $[ "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes", "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes", + "NETCONFIG_DNS_POLICY" : "auto", + "NETCONFIG_DNS_STATIC_SERVERS" : "1.2.3.4", ], ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/Read.out new/yast2-dns-server-2.17.6/testsuite/tests/Read.out --- old/yast2-dns-server-2.17.5/testsuite/tests/Read.out 2007-11-14 14:31:31.000000000 +0100 +++ new/yast2-dns-server-2.17.6/testsuite/tests/Read.out 2008-08-11 12:50:46.000000000 +0200 @@ -5,12 +5,12 @@ Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED 0 -Read .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" -Read .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" +Read .sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Dir .dns.named.value.options: ["directory", "notify"] Read .dns.named.value.options.directory ["\"/var/lib/named\""] Read .dns.named.value.options.notify ["no"] +Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Read .dns.named.value.acl [] Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/Read.ycp new/yast2-dns-server-2.17.6/testsuite/tests/Read.ycp --- old/yast2-dns-server-2.17.5/testsuite/tests/Read.ycp 2007-11-14 14:31:31.000000000 +0100 +++ new/yast2-dns-server-2.17.6/testsuite/tests/Read.ycp 2008-08-11 13:17:53.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain@suse.cz>, Lukas Ocilka <locilka@suse.cz> * Copyright: Copyright 2004, Novell, Inc. All rights reserved. * - * $Id: Read.ycp 33316 2006-10-10 13:17:16Z locilka $ + * $Id: Read.ycp 49930 2008-08-11 11:17:52Z locilka $ * * Testsuite for reading configuration for dns-server */ @@ -189,6 +189,8 @@ "config" : $[ "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes", "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes", + "NETCONFIG_DNS_POLICY" : "STATIC", + "NETCONFIG_DNS_STATIC_SERVERS" : "", ], ], "console" : $[ "CONSOLE_ENCODING" : "utf8" ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/Write.out new/yast2-dns-server-2.17.6/testsuite/tests/Write.out --- old/yast2-dns-server-2.17.5/testsuite/tests/Write.out 2008-07-23 15:31:58.000000000 +0200 +++ new/yast2-dns-server-2.17.6/testsuite/tests/Write.out 2008-08-11 13:04:26.000000000 +0200 @@ -11,9 +11,7 @@ Write .dns.named.value.options."xxx" nil true Write .dns.named.value.options."forwarders" nil true Write .dns.named.value.options."directory" ["\"/var/lib/named\""] true -Write .dns.named.value.options."include" ["\"/etc/named.d/forwarders.conf\""] true Write .dns.named.value.options."notify" ["no"] true -Write .dns.named-forwarders ["/etc/named.d/forwarders.conf", "{}"] true Dir .dns.named.section: ["options", "zone \"localhost\" in"] Write .dns.named nil true Dir .dns.named.value: ["options", "zone \"localhost\" in"] @@ -25,9 +23,7 @@ Write .dns.named nil true Write .sysconfig.named.NAMED_RUN_CHROOTED "yes" true Write .sysconfig.named nil true -Write .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "no" true -Write .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "no" true -Write .sysconfig.network.config nil true +Write .sysconfig.network.config.NETCONFIG_DNS_POLICY "0" true Read .sysconfig.named.NAMED_INITIALIZE_SCRIPTS 0 Write .sysconfig.named.NAMED_INITIALIZE_SCRIPTS "" true Write .sysconfig.named nil true @@ -39,4 +35,7 @@ Write .dns.named.value."zone \"example.com\" in".type ["master"] true Execute .target.bash "/etc/init.d/named stop" 0 Write .target.ycp "/var/lib/YaST2/dns_server" $[] true +Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true +Write .sysconfig.network.config nil true +Execute .target.bash_output "/sbin/netconfig update" $["exit":0, "stdout":"20030806"] Return true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadGlobalOptions.out new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadGlobalOptions.out --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadGlobalOptions.out 2008-07-23 15:34:03.000000000 +0200 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadGlobalOptions.out 2008-08-11 13:07:13.000000000 +0200 @@ -5,12 +5,12 @@ Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil -Read .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" -Read .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" +Read .sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Dir .dns.named.value.options: ["directory", "notify"] Read .dns.named.value.options.directory ["\"/var/lib/named\""] Read .dns.named.value.options.notify ["no"] +Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "1.2.3.4 5.6.7.8 9.10.11.12" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Read .dns.named.value.acl [] Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil @@ -20,5 +20,5 @@ Dir .dns.named.value."zone \"localhost\" in": ["file", "type"] Read .dns.named.value."zone \"localhost\" in"."file" ["\"localhost.zone\""] Read .dns.named.value."zone \"localhost\" in"."type" ["master"] -Return [$["key":"directory", "value":"\"/var/lib/named\""], $["key":"notify", "value":"no"], $["key":"forwarders", "value":""]] +Return [$["key":"directory", "value":"\"/var/lib/named\""], $["key":"notify", "value":"no"], $["key":"forwarders", "value":"1.2.3.4; 5.6.7.8; 9.10.11.12"]] Dump ========================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadGlobalOptions.ycp new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadGlobalOptions.ycp --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadGlobalOptions.ycp 2007-11-14 14:31:31.000000000 +0100 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadGlobalOptions.ycp 2008-08-11 13:17:53.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain@suse.cz>, Lukas Ocilka <locilka@suse.cz> * Copyright: Copyright 2004, Novell, Inc. All rights reserved. * - * $Id: YaPIReadGlobalOptions.ycp 33316 2006-10-10 13:17:16Z locilka $ + * $Id: YaPIReadGlobalOptions.ycp 49930 2008-08-11 11:17:52Z locilka $ * * Testsuite for reading global options for dns-server */ @@ -173,6 +173,8 @@ "config" : $[ "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes", "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes", + "NETCONFIG_DNS_POLICY" : "STATIC", + "NETCONFIG_DNS_STATIC_SERVERS" : "1.2.3.4 5.6.7.8 9.10.11.12", ], ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadZones.out new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadZones.out --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadZones.out 2007-11-14 14:31:31.000000000 +0100 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadZones.out 2008-08-11 13:09:13.000000000 +0200 @@ -5,12 +5,12 @@ Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil -Read .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" -Read .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" +Read .sysconfig.network.config.NETCONFIG_DNS_POLICY "auto" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Dir .dns.named.value.options: ["directory", "notify"] Read .dns.named.value.options.directory ["\"/var/lib/named\""] Read .dns.named.value.options.notify ["no"] +Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Read .dns.named.value.acl [] Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadZones.ycp new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadZones.ycp --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIReadZones.ycp 2007-11-14 14:31:31.000000000 +0100 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIReadZones.ycp 2008-08-11 13:17:53.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain@suse.cz>, Lukas Ocilka <locilka@suse.cz> * Copyright: Copyright 2004, Novell, Inc. All rights reserved. * - * $Id: YaPIReadZones.ycp 33316 2006-10-10 13:17:16Z locilka $ + * $Id: YaPIReadZones.ycp 49930 2008-08-11 11:17:52Z locilka $ * * Testsuite for reading dns zones for dns-server */ @@ -172,6 +172,8 @@ "config" : $[ "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes", "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes", + "NETCONFIG_DNS_POLICY" : "auto", + "NETCONFIG_DNS_STATIC_SERVERS" : "", ], ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteGlobalOptions.out new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteGlobalOptions.out --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteGlobalOptions.out 2008-07-23 15:34:04.000000000 +0200 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteGlobalOptions.out 2008-08-11 13:15:24.000000000 +0200 @@ -5,12 +5,12 @@ Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil -Read .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" -Read .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" +Read .sysconfig.network.config.NETCONFIG_DNS_POLICY "auto" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Dir .dns.named.value.options: ["directory", "notify"] Read .dns.named.value.options.directory ["\"/var/lib/named\""] Read .dns.named.value.options.notify ["no"] +Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Read .dns.named.value.acl [] Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil @@ -29,9 +29,7 @@ Write .dns.named.value.options."notify" nil true Write .dns.named.value.options."forwarders" nil true Write .dns.named.value.options."dump-file" ["\"/var/log/named_dump.db\""] true -Write .dns.named.value.options."include" ["\"/etc/named.d/forwarders.conf\""] true Write .dns.named.value.options."statistics-file" ["\"/var/log/named.stats\""] true -Write .dns.named-forwarders ["/etc/named.d/forwarders.conf", "{}"] true Dir .dns.named.section: ["options", "zone \"localhost\" in"] Write .dns.named nil true Dir .dns.named.value: ["acl", "options", "zone \"localhost\" in"] @@ -43,13 +41,14 @@ Write .dns.named nil true Write .sysconfig.named.NAMED_RUN_CHROOTED "yes" true Write .sysconfig.named nil true -Write .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" true -Write .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" true -Write .sysconfig.network.config nil true +Write .sysconfig.network.config.NETCONFIG_DNS_POLICY "auto" true Read .sysconfig.named.NAMED_INITIALIZE_SCRIPTS nil Write .sysconfig.named.NAMED_INITIALIZE_SCRIPTS "" true Write .sysconfig.named nil true Execute .target.bash "/etc/init.d/named stop" 0 Write .target.ycp "/var/lib/YaST2/dns_server" $[] true +Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true +Write .sysconfig.network.config nil true +Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""] Return true Dump ========================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteGlobalOptions.ycp new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteGlobalOptions.ycp --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteGlobalOptions.ycp 2007-11-14 14:31:31.000000000 +0100 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteGlobalOptions.ycp 2008-08-11 13:17:53.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain@suse.cz>, Lukas Ocilka <locilka@suse.cz> * Copyright: Copyright 2004, Novell, Inc. All rights reserved. * - * $Id: YaPIWriteGlobalOptions.ycp 33316 2006-10-10 13:17:16Z locilka $ + * $Id: YaPIWriteGlobalOptions.ycp 49930 2008-08-11 11:17:52Z locilka $ * * Testsuite for writting global options for dns-server */ @@ -160,6 +160,8 @@ "config" : $[ "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes", "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes", + "NETCONFIG_DNS_POLICY" : "auto", + "NETCONFIG_DNS_STATIC_SERVERS" : "", ], ], "console" : $[ "CONSOLE_ENCODING" : "utf8" ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteZones.out new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteZones.out --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteZones.out 2008-07-23 15:35:29.000000000 +0200 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteZones.out 2008-08-11 13:16:25.000000000 +0200 @@ -5,12 +5,12 @@ Execute .dns.named_conf_convert "/etc/named.conf" 0 Execute .target.bash_output "stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' /etc/named.conf" $["exit":1, "stderr":"", "stdout":""] Read .sysconfig.named.NAMED_RUN_CHROOTED nil -Read .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" -Read .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" +Read .sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Dir .dns.named.value.options: ["directory", "notify"] Read .dns.named.value.options.directory ["\"/var/lib/named\""] Read .dns.named.value.options.notify ["no"] +Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "5.5.5.5 6.6.6.6 7.7.7.7" Dir .dns.named.section: ["options", "zone \"localhost\" in"] Read .dns.named.value.acl [] Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil @@ -27,9 +27,8 @@ Dir .dns.named.value.options: ["directory", "notify"] Write .dns.named.value.options."forwarders" nil true Write .dns.named.value.options."directory" ["\"/var/lib/named\""] true -Write .dns.named.value.options."include" ["\"/etc/named.d/forwarders.conf\""] true +Write .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "5.5.5.5 6.6.6.6 7.7.7.7" true Write .dns.named.value.options."notify" ["no"] true -Write .dns.named-forwarders ["/etc/named.d/forwarders.conf", "{}"] true Dir .dns.named.section: ["options", "zone \"localhost\" in"] Write .dns.named nil true Dir .dns.named.value: ["acl", "options", "zone \"localhost\" in"] @@ -41,9 +40,7 @@ Write .dns.named nil true Write .sysconfig.named.NAMED_RUN_CHROOTED "yes" true Write .sysconfig.named nil true -Write .sysconfig.network.config.MODIFY_NAMED_CONF_DYNAMICALLY "yes" true -Write .sysconfig.network.config.MODIFY_RESOLV_CONF_DYNAMICALLY "yes" true -Write .sysconfig.network.config nil true +Write .sysconfig.network.config.NETCONFIG_DNS_POLICY "STATIC" true Read .sysconfig.named.NAMED_INITIALIZE_SCRIPTS nil Write .sysconfig.named.NAMED_INITIALIZE_SCRIPTS "" true Write .sysconfig.named nil true @@ -57,5 +54,8 @@ Write .dns.named.value."zone \"example.com\" in".type ["master"] true Execute .target.bash "/etc/init.d/named stop" 0 Write .target.ycp "/var/lib/YaST2/dns_server" $[] true +Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true +Write .sysconfig.network.config nil true +Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""] Return true Dump ========================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteZones.ycp new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteZones.ycp --- old/yast2-dns-server-2.17.5/testsuite/tests/YaPIWriteZones.ycp 2007-11-14 14:31:31.000000000 +0100 +++ new/yast2-dns-server-2.17.6/testsuite/tests/YaPIWriteZones.ycp 2008-08-11 13:17:53.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain@suse.cz>, Lukas Ocilka <locilka@suse.cz> * Copyright: Copyright 2004, Novell, Inc. All rights reserved. * - * $Id: YaPIWriteZones.ycp 33316 2006-10-10 13:17:16Z locilka $ + * $Id: YaPIWriteZones.ycp 49930 2008-08-11 11:17:52Z locilka $ * * Testsuite for reading configuration for dns-server */ @@ -171,6 +171,8 @@ "config" : $[ "MODIFY_NAMED_CONF_DYNAMICALLY" : "yes", "MODIFY_RESOLV_CONF_DYNAMICALLY" : "yes", + "NETCONFIG_DNS_POLICY" : "STATIC", + "NETCONFIG_DNS_STATIC_SERVERS" : "5.5.5.5 6.6.6.6 7.7.7.7", ], ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.5/VERSION new/yast2-dns-server-2.17.6/VERSION --- old/yast2-dns-server-2.17.5/VERSION 2008-08-06 16:05:07.000000000 +0200 +++ new/yast2-dns-server-2.17.6/VERSION 2008-08-11 12:13:44.000000000 +0200 @@ -1 +1 @@ -2.17.5 +2.17.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org