Hello community,
here is the log from the commit of package yast2-dns-server
checked in at Thu Apr 13 17:25:37 CEST 2006.
--------
--- yast2-dns-server/yast2-dns-server.changes 2006-04-10 12:08:16.000000000 +0200
+++ NOARCH/yast2-dns-server/yast2-dns-server.changes 2006-04-12 11:18:50.000000000 +0200
@@ -1,0 +2,17 @@
+Wed Apr 12 11:04:46 CEST 2006 - locilka@suse.cz
+
+- Convert the named.conf file to the format understandable for
+ IniAgent used for reading and writing configuration. Current
+ configuration is backed up as 'named.conf.YaST-backup' file.
+- Handling comments in zone file better (both #165133).
+- Fixed testsuites for added calls.
+- 2.13.11
+
+-------------------------------------------------------------------
+Tue Apr 11 14:21:48 CEST 2006 - locilka@suse.cz
+
+- After the LDAP storage was fixed and we could enable is, it was
+ impossible to disable it (#165189).
+- 2.13.10
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-2.13.9.tar.bz2
New:
----
yast2-dns-server-2.13.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.b4HH8c/_old 2006-04-13 17:24:45.000000000 +0200
+++ /var/tmp/diff_new_pack.b4HH8c/_new 2006-04-13 17:24:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dns-server (Version 2.13.9)
+# spec file for package yast2-dns-server (Version 2.13.11)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-dns-server
-Version: 2.13.9
+Version: 2.13.11
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dns-server-2.13.9.tar.bz2
+Source0: yast2-dns-server-2.13.11.tar.bz2
prefix: /usr
BuildRequires: perl-Digest-SHA1 perl-X500-DN perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite
Requires: yast2 /usr/bin/host perl-gettext yast2-perl-bindings bind-utils yast2-ldap perl-X500-DN perl-Digest-SHA1 perl-Parse-RecDescent yast2-ldap-client
@@ -33,7 +33,7 @@
Jiri Srain
%prep
-%setup -n yast2-dns-server-2.13.9
+%setup -n yast2-dns-server-2.13.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,11 +68,25 @@
/usr/share/YaST2/scrconf/dns_zone.scr
/usr/share/YaST2/scrconf/cfg_named.scr
/usr/share/YaST2/scrconf/named_forwarders.scr
+/usr/share/YaST2/scrconf/named_forwarders.scr
+/usr/share/YaST2/scrconf/convert_named_conf.scr
/usr/lib/YaST2/servers_non_y2/ag_dns_zone
/usr/lib/YaST2/servers_non_y2/ag_named_forwarders
+/usr/lib/YaST2/servers_non_y2/ag_convert_named_conf
%doc %{prefix}/share/doc/packages/yast2-dns-server
%changelog -n yast2-dns-server
+* Wed Apr 12 2006 - locilka@suse.cz
+- Convert the named.conf file to the format understandable for
+ IniAgent used for reading and writing configuration. Current
+ configuration is backed up as 'named.conf.YaST-backup' file.
+- Handling comments in zone file better (both #165133).
+- Fixed testsuites for added calls.
+- 2.13.11
+* Tue Apr 11 2006 - locilka@suse.cz
+- After the LDAP storage was fixed and we could enable is, it was
+ impossible to disable it (#165189).
+- 2.13.10
* Mon Apr 10 2006 - locilka@suse.cz
- Fixing call to LDAPInit()
- 2.13.9
++++++ yast2-dns-server-2.13.9.tar.bz2 -> yast2-dns-server-2.13.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/Makefile.am new/yast2-dns-server-2.13.11/Makefile.am
--- old/yast2-dns-server-2.13.9/Makefile.am 2006-04-10 12:12:38.000000000 +0200
+++ new/yast2-dns-server-2.13.11/Makefile.am 2006-04-12 11:52:55.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/Makefile.in new/yast2-dns-server-2.13.11/Makefile.in
--- old/yast2-dns-server-2.13.9/Makefile.in 2006-04-10 12:12:46.000000000 +0200
+++ new/yast2-dns-server-2.13.11/Makefile.in 2006-04-12 11:52:59.000000000 +0200
@@ -783,7 +783,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -826,9 +826,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/VERSION new/yast2-dns-server-2.13.11/VERSION
--- old/yast2-dns-server-2.13.9/VERSION 2006-04-10 12:07:59.000000000 +0200
+++ new/yast2-dns-server-2.13.11/VERSION 2006-04-12 11:21:58.000000000 +0200
@@ -1 +1 @@
-2.13.9
+2.13.11
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/agents/Makefile.am new/yast2-dns-server-2.13.11/agents/Makefile.am
--- old/yast2-dns-server-2.13.9/agents/Makefile.am 2006-02-03 08:48:47.000000000 +0100
+++ new/yast2-dns-server-2.13.11/agents/Makefile.am 2006-04-12 11:21:58.000000000 +0200
@@ -3,11 +3,13 @@
#
agent_SCRIPTS = ag_dns_zone \
- ag_named_forwarders
+ ag_named_forwarders \
+ ag_convert_named_conf
scrconf_DATA = dns_zone.scr \
dns_named.scr \
cfg_named.scr \
- named_forwarders.scr
+ named_forwarders.scr \
+ convert_named_conf.scr
EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/agents/Makefile.in new/yast2-dns-server-2.13.11/agents/Makefile.in
--- old/yast2-dns-server-2.13.9/agents/Makefile.in 2006-04-10 12:12:45.000000000 +0200
+++ new/yast2-dns-server-2.13.11/agents/Makefile.in 2006-04-12 11:52:58.000000000 +0200
@@ -169,12 +169,14 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
agent_SCRIPTS = ag_dns_zone \
- ag_named_forwarders
+ ag_named_forwarders \
+ ag_convert_named_conf
scrconf_DATA = dns_zone.scr \
dns_named.scr \
cfg_named.scr \
- named_forwarders.scr
+ named_forwarders.scr \
+ convert_named_conf.scr
EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/agents/ag_convert_named_conf new/yast2-dns-server-2.13.11/agents/ag_convert_named_conf
--- old/yast2-dns-server-2.13.9/agents/ag_convert_named_conf 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-dns-server-2.13.11/agents/ag_convert_named_conf 2006-04-12 11:32:25.000000000 +0200
@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+
+use ycp;
+use File::Temp;
+
+while ( <STDIN> ) {
+ my ($command, $path, $argument) = ycp::ParseCommand ($_);
+
+ if ($command eq "Execute") {
+ if ($path eq "." && ! ref ($argument)) {
+ y2milestone($argument);
+ my $file = $argument;
+
+ y2milestone ("Reading file '$file'");
+
+ if (! open (FILE, "$file")) {
+ y2error("Cannot open configuration file. ".$file." -> ".$!);
+ ycp::Return (undef);
+ }
+
+ my $file_content = join('', <FILE>);
+ my $file_content_backup = $file_content;
+ close (FILE);
+
+ # convert the file content to the IniAgent-understandable format
+ $file_content =~ s/(options|view|logging)[ \t\n]*\{/$1 {/g;
+ $file_content =~ s/(zone)[ \t\n]*([^ \t\n]+)[ \t\n]*([^ \t\n]+)[ \t\n]*\{/$1 $2 $3 {/g;
+
+ if ($file_content ne $file_content_backup) {
+ my $backup_file = $file.'.YaST-backup';
+ y2milestone("File structure (".$file.") has been changed, saving backup into ".$backup_file."...");
+
+ if (open(FILE, ">$backup_file")) {
+ print FILE $file_content_backup;
+ close(FILE);
+
+ y2milestone("Backup file saved, converting '".$file."'...");
+ if (open(FILE, ">$file")) {
+ print FILE $file_content;
+ close(FILE);
+ } else {
+ y2error("Cannot write converted file '".$file."': ".$!);
+ }
+ } else {
+ y2error("Cannot write backup file '".$backup_file."': ".$!);
+ }
+ }
+
+ ycp::Return ("true");
+ } else {
+ y2error ("Wrong arguments");
+ ycp::Return ("false");
+ }
+
+
+ } elsif ($command eq "result") {
+ exit 0;
+ } else {
+ y2error ("Wrong path or arguments");
+ ycp::Return ("false");
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/agents/ag_dns_zone new/yast2-dns-server-2.13.11/agents/ag_dns_zone
--- old/yast2-dns-server-2.13.9/agents/ag_dns_zone 2006-02-03 08:48:47.000000000 +0100
+++ new/yast2-dns-server-2.13.11/agents/ag_dns_zone 2006-04-12 11:21:58.000000000 +0200
@@ -60,7 +60,7 @@
my @a = @{$argument};
my $file = $a[0];
my %data = %{$a[1]};
-
+
y2milestone ("Writing zone file $file");
open (OUT, ">$file");
@@ -119,26 +119,30 @@
{
@records = @{$data{"records"}};
}
- my $current_origin = ((exists $data{"ORIGIN"}) ? $data{"ORIGIN"}:$domain_name);
+ my $current_origin = ((defined $data{"ORIGIN"}) ? $data{"ORIGIN"}:$domain_name);
if ($current_origin eq ".") { $current_origin = $domain_name; }
foreach $ref (@records) {
%record = %{$ref};
- if ((exists ($record{"comment"})) && ($record{"comment"} ne ""))
+ if ((defined ($record{"comment"})) && ($record{"comment"} ne ""))
{
- print OUT "$record{\"comment\"}";
+ print OUT $record{"comment"};
}
my $type = $record{"type"} || '';
my $value = $record{"value"} || '';
my $key = $record{"key"} || '';
- if ($record{"type"} eq "TTL")
+ if ($type eq "TTL")
{
print OUT "\$TTL $value\n";
}
- elsif ($record{"type"} eq "ORIGIN")
+ elsif ($type eq "ORIGIN")
{
$current_origin = $value;
print OUT "\$ORIGIN $value\n";
}
+ elsif ($type eq "comment")
+ {
+ next;
+ }
else
{
# MX and NS records should be all in FQDN format
@@ -262,7 +266,12 @@
$rec{"key"} = $previous_key;
} else {
# defined key sets the "previous_key" for the next line
- $previous_key = $rec{"key"};
+ if ($rec{"key"} !~ /^;/) {
+ $previous_key = $rec{"key"};
+ }
+ }
+ if ($previous_key eq "" && $zone ne "\@") {
+ $previous_key = $zone;
}
# creating absolute names from name and origin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/agents/convert_named_conf.scr new/yast2-dns-server-2.13.11/agents/convert_named_conf.scr
--- old/yast2-dns-server-2.13.9/agents/convert_named_conf.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-dns-server-2.13.11/agents/convert_named_conf.scr 2006-04-12 11:32:25.000000000 +0200
@@ -0,0 +1,13 @@
+/**
+ * File: convert_named_conf.scr
+ * Summary: Agent for converting named.conf into the readable format
+ * Author: Lukas Ocilka
+ * Access: execute
+ *
+ * $Id: named_forwarders.scr 18759 2004-08-23 13:22:52Z locilka $
+ *
+ */
+.dns.named_conf_convert
+
+`ag_convert_named_conf ()
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/configure new/yast2-dns-server-2.13.11/configure
--- old/yast2-dns-server-2.13.9/configure 2006-04-10 12:12:43.000000000 +0200
+++ new/yast2-dns-server-2.13.11/configure 2006-04-12 11:52:58.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-dns-server 2.13.9.
+# Generated by GNU Autoconf 2.59 for yast2-dns-server 2.13.11.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-dns-server'
PACKAGE_TARNAME='yast2-dns-server'
-PACKAGE_VERSION='2.13.9'
-PACKAGE_STRING='yast2-dns-server 2.13.9'
+PACKAGE_VERSION='2.13.11'
+PACKAGE_STRING='yast2-dns-server 2.13.11'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.13.9 to adapt to many kinds of systems.
+\`configure' configures yast2-dns-server 2.13.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-dns-server 2.13.9:";;
+ short | recursive ) echo "Configuration of yast2-dns-server 2.13.11:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-dns-server configure 2.13.9
+yast2-dns-server configure 2.13.11
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.13.9, which was
+It was created by yast2-dns-server $as_me 2.13.11, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-dns-server'
- VERSION='2.13.9'
+ VERSION='2.13.11'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.9"
+VERSION="2.13.11"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-dns-server $as_me 2.13.9, which was
+This file was extended by yast2-dns-server $as_me 2.13.11, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-dns-server config.status 2.13.9
+yast2-dns-server config.status 2.13.11
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/configure.in new/yast2-dns-server-2.13.11/configure.in
--- old/yast2-dns-server-2.13.9/configure.in 2006-04-10 12:12:37.000000000 +0200
+++ new/yast2-dns-server-2.13.11/configure.in 2006-04-12 11:52:55.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dns-server, 2.13.9, http://www.suse.de/feedback, yast2-dns-server)
+AC_INIT(yast2-dns-server, 2.13.11, http://www.suse.de/feedback, yast2-dns-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.9"
+VERSION="2.13.11"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/src/DnsServer.pm new/yast2-dns-server-2.13.11/src/DnsServer.pm
--- old/yast2-dns-server-2.13.9/src/DnsServer.pm 2006-04-07 15:37:23.000000000 +0200
+++ new/yast2-dns-server-2.13.11/src/DnsServer.pm 2006-04-12 11:21:58.000000000 +0200
@@ -77,6 +77,8 @@
my $configuration_timestamp = "";
+my $configfile = '/etc/named.conf';
+
##-------------------------------------------------------------------------
##----------------- various routines --------------------------------------
@@ -975,7 +977,6 @@
sub GetConfigurationStat {
my $class = shift;
- my $configfile = "/etc/named.conf";
my $ret = SCR->Execute (".target.bash_output",
"stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' ".$configfile
);
@@ -1054,6 +1055,8 @@
Progress->NextStage ();
+ y2milestone("Converting configfile: ", SCR->Execute (".dns.named_conf_convert", $configfile));
+
$configuration_timestamp = $self->GetConfigurationStat();
# Information about the daemon
@@ -1294,7 +1297,6 @@
### Bugzilla #46121, Configuration file changed by hand, INI-Agent would break
my $new_configuration_timestamp = $self->GetConfigurationStat();
- my $configfile = "/etc/named.conf";
my $yast2_suffix = ".yast2-save";
# timestamp differs from the Read()
if ($new_configuration_timestamp ne $configuration_timestamp) {
@@ -1348,10 +1350,9 @@
$modify_resolv_conf_dynamically ? "yes" : "no");
SCR->Write (".sysconfig.network.config", undef);
- if ($use_ldap) {
- #set to sysconfig if LDAP is to be used
- LdapStore ();
- }
+ # set to sysconfig if LDAP is to be used
+ # set the sysconfig also if LDAP is not to be used (bug #165189)
+ LdapStore ();
Progress->NextStage ();
@@ -1482,7 +1483,7 @@
{
# Initialize LDAP if needed
$self->InitYapiConfigOptions ({"use_ldap" => $use_ldap});
- $self->LdapInit (1);
+ $self->LdapInit (0);
$self->CleanYapiConfigOptions ();
}
@@ -1549,9 +1550,10 @@
return \@ret;
}
-BEGIN { $TYPEINFO{LdapInit} = ["function", "void", "boolean" ]; }
+BEGIN { $TYPEINFO{LdapInit} = ["function", "boolean", "boolean" ]; }
sub LdapInit {
my $self = shift;
+ my $ask_user_to_enable_ldap = shift;
my $report_errors = shift || 0;
$ldap_available = 0;
@@ -1634,14 +1636,21 @@
else
{
my $reload_script = SCR->Read (".sysconfig.named.NAMED_INITIALIZE_SCRIPTS") || "";
- if (! $reload_script)
+ if (! $reload_script || $reload_script !~ /.*ldapdump.*/)
{
- # yes-no popup
- $use_ldap = Popup->YesNo (__("Enable LDAP support?"));
- y2milestone ("User chose to use LDAP: $use_ldap");
+ # don't ask user in the read dialog
+ if ($ask_user_to_enable_ldap) {
+ # yes-no popup
+ $use_ldap = Popup->YesNo (__("Enable LDAP support?"));
+ y2milestone ("User choose to use LDAP: $use_ldap");
+ # just disable LDAP
+ } else {
+ $use_ldap = 0;
+ }
}
else
{
+ # ldapdump script in /etc/sysconfig/named/NAMED_INITIALIZE_SCRIPTS means use-LDAP
$use_ldap = $reload_script =~ /.*ldapdump.*/;
y2milestone ("Use LDAP according to sysconfig: $use_ldap");
}
@@ -1902,6 +1911,7 @@
if ($use_ldap)
{
+ y2milestone("LdapStore: using ldap");
my $already_present = scalar (grep (/ldapdump/, @reload_scripts)) > 0;
if (! $already_present)
{
@@ -1910,10 +1920,12 @@
}
else
{
+ y2milestone("LdapStore: not using ldap");
@reload_scripts = grep (!/ldapdump/, @reload_scripts);
}
$reload_script = join (" ", @reload_scripts);
+ y2milestone("Writing reload scripts: '".$reload_script."'");
SCR->Write (".sysconfig.named.NAMED_INITIALIZE_SCRIPTS", $reload_script);
SCR->Write (".sysconfig.named", undef);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/src/dialog-masterzone.ycp new/yast2-dns-server-2.13.11/src/dialog-masterzone.ycp
--- old/yast2-dns-server-2.13.9/src/dialog-masterzone.ycp 2006-02-03 08:48:48.000000000 +0100
+++ new/yast2-dns-server-2.13.11/src/dialog-masterzone.ycp 2006-04-12 11:21:58.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: dialog-masterzone.ycp 24821 2005-08-11 14:50:31Z locilka $
+ * $Id: dialog-masterzone.ycp 30022 2006-04-12 09:13:14Z locilka $
*/
{
@@ -917,6 +917,10 @@
{
return -1;
}
+ if (m["type"]:"" == "comment")
+ {
+ return -1;
+ }
return index;
});
ret = filter (integer r, ret, ``(r != nil && r != -1));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/testsuite/tests/Read.out new/yast2-dns-server-2.13.11/testsuite/tests/Read.out
--- old/yast2-dns-server-2.13.9/testsuite/tests/Read.out 2006-02-03 08:48:49.000000000 +0100
+++ new/yast2-dns-server-2.13.11/testsuite/tests/Read.out 2006-04-12 11:21:58.000000000 +0200
@@ -2,6 +2,7 @@
Execute .target.bash "/etc/init.d/named status" 0
Execute .target.bash "/etc/init.d/named stop" 0
Execute .target.bash "/etc/init.d/named restart" 0
+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"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/testsuite/tests/Write.out new/yast2-dns-server-2.13.11/testsuite/tests/Write.out
--- old/yast2-dns-server-2.13.9/testsuite/tests/Write.out 2006-02-03 08:48:49.000000000 +0100
+++ new/yast2-dns-server-2.13.11/testsuite/tests/Write.out 2006-04-12 11:21:58.000000000 +0200
@@ -30,6 +30,9 @@
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
+Read .sysconfig.named.NAMED_INITIALIZE_SCRIPTS 0
+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
Return true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/testsuite/tests/YaPIReadGlobalOptions.out new/yast2-dns-server-2.13.11/testsuite/tests/YaPIReadGlobalOptions.out
--- old/yast2-dns-server-2.13.9/testsuite/tests/YaPIReadGlobalOptions.out 2006-02-03 08:48:49.000000000 +0100
+++ new/yast2-dns-server-2.13.11/testsuite/tests/YaPIReadGlobalOptions.out 2006-04-12 11:21:58.000000000 +0200
@@ -2,6 +2,7 @@
Execute .target.bash "/etc/init.d/named status" 0
Execute .target.bash "/etc/init.d/named stop" 0
Execute .target.bash "/etc/init.d/named restart" 0
+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"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/testsuite/tests/YaPIReadZones.out new/yast2-dns-server-2.13.11/testsuite/tests/YaPIReadZones.out
--- old/yast2-dns-server-2.13.9/testsuite/tests/YaPIReadZones.out 2006-02-03 08:48:49.000000000 +0100
+++ new/yast2-dns-server-2.13.11/testsuite/tests/YaPIReadZones.out 2006-04-12 11:21:58.000000000 +0200
@@ -2,6 +2,7 @@
Execute .target.bash "/etc/init.d/named status" 0
Execute .target.bash "/etc/init.d/named stop" 0
Execute .target.bash "/etc/init.d/named restart" 0
+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"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/testsuite/tests/YaPIWriteGlobalOptions.out new/yast2-dns-server-2.13.11/testsuite/tests/YaPIWriteGlobalOptions.out
--- old/yast2-dns-server-2.13.9/testsuite/tests/YaPIWriteGlobalOptions.out 2006-02-03 08:48:49.000000000 +0100
+++ new/yast2-dns-server-2.13.11/testsuite/tests/YaPIWriteGlobalOptions.out 2006-04-12 11:21:58.000000000 +0200
@@ -2,6 +2,7 @@
Execute .target.bash "/etc/init.d/named status" 0
Execute .target.bash "/etc/init.d/named stop" 0
Execute .target.bash "/etc/init.d/named restart" 0
+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"
@@ -41,6 +42,9 @@
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
+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
Return true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.9/testsuite/tests/YaPIWriteZones.out new/yast2-dns-server-2.13.11/testsuite/tests/YaPIWriteZones.out
--- old/yast2-dns-server-2.13.9/testsuite/tests/YaPIWriteZones.out 2006-02-03 08:48:49.000000000 +0100
+++ new/yast2-dns-server-2.13.11/testsuite/tests/YaPIWriteZones.out 2006-04-12 11:21:58.000000000 +0200
@@ -2,6 +2,7 @@
Execute .target.bash "/etc/init.d/named status" 0
Execute .target.bash "/etc/init.d/named stop" 0
Execute .target.bash "/etc/init.d/named restart" 0
+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"
@@ -50,6 +51,9 @@
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
+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
Return true
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...