Hello community,
here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2012-06-10 20:20:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dns-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dns-server", Maintainer is "locilka@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2012-05-03 11:02:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new/yast2-dns-server.changes 2012-06-10 21:52:51.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Jun 5 09:04:05 UTC 2012 - locilka@suse.com
+
+- Handling missing /etc/named.conf (BNC #765445)
+- 2.23.3
+
+------------------------------------------------------------------
+Fri Jun 1 13:58:36 UTC 2012 - locilka@suse.com
+
+- Fixed setting up the LDAP (BNC #690237)
+
+------------------------------------------------------------------
Old:
----
yast2-dns-server-2.23.2.tar.bz2
New:
----
yast2-dns-server-2.23.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.0fnad0/_old 2012-06-10 21:52:52.000000000 +0200
+++ /var/tmp/diff_new_pack.0fnad0/_new 2012-06-10 21:52:52.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-dns-server
-Version: 2.23.2
+Version: 2.23.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-dns-server-2.23.2.tar.bz2 -> yast2-dns-server-2.23.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/COPYING new/yast2-dns-server-2.23.3/COPYING
--- old/yast2-dns-server-2.23.2/COPYING 2012-04-24 14:57:53.000000000 +0200
+++ new/yast2-dns-server-2.23.3/COPYING 2012-06-07 16:14:58.000000000 +0200
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/Makefile.am.common new/yast2-dns-server-2.23.3/Makefile.am.common
--- old/yast2-dns-server-2.23.2/Makefile.am.common 2012-04-24 14:57:19.000000000 +0200
+++ new/yast2-dns-server-2.23.3/Makefile.am.common 2012-06-07 16:10:51.000000000 +0200
@@ -30,7 +30,7 @@
dist-hook: check-syntax
CHECK_SYNTAX = true
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/VERSION new/yast2-dns-server-2.23.3/VERSION
--- old/yast2-dns-server-2.23.2/VERSION 2012-04-24 14:57:14.000000000 +0200
+++ new/yast2-dns-server-2.23.3/VERSION 2012-06-07 16:09:12.000000000 +0200
@@ -1 +1 @@
-2.23.2
+2.23.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/agents/cfg_named.scr new/yast2-dns-server-2.23.3/agents/cfg_named.scr
--- old/yast2-dns-server-2.23.2/agents/cfg_named.scr 2012-04-17 11:17:59.000000000 +0200
+++ new/yast2-dns-server-2.23.3/agents/cfg_named.scr 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Author: Jiri Srain
* Access: read / write
*
- * $Id: cfg_named.scr 13018 2003-12-11 12:52:53Z jhumpol $
+ * $Id$
*
* Read/Sets the values defined in <tt>/etc/sysconfig/named</tt>
* in an easy manner.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/agents/dns_named.scr new/yast2-dns-server-2.23.3/agents/dns_named.scr
--- old/yast2-dns-server-2.23.2/agents/dns_named.scr 2012-04-17 11:17:59.000000000 +0200
+++ new/yast2-dns-server-2.23.3/agents/dns_named.scr 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Author: Jiri Srain
* Access: read, write
*
- * $Id: dns_named.scr 42050 2007-11-14 13:07:33Z locilka $
+ * $Id$
*
*/
.dns.named
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/agents/dns_zone.scr new/yast2-dns-server-2.23.3/agents/dns_zone.scr
--- old/yast2-dns-server-2.23.2/agents/dns_zone.scr 2012-04-17 11:17:59.000000000 +0200
+++ new/yast2-dns-server-2.23.3/agents/dns_zone.scr 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Author: Jiri Srain
* Access: read, write
*
- * $Id: dns_zone.scr 10085 2003-06-17 11:18:36Z jsrain $
+ * $Id$
*
*/
.dns.zone
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/agents/named_forwarders.scr new/yast2-dns-server-2.23.3/agents/named_forwarders.scr
--- old/yast2-dns-server-2.23.2/agents/named_forwarders.scr 2012-04-17 11:17:59.000000000 +0200
+++ new/yast2-dns-server-2.23.3/agents/named_forwarders.scr 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Author: Jiri Srain
* Access: read, write
*
- * $Id: named_forwarders.scr 18759 2004-08-23 13:22:52Z locilka $
+ * $Id$
*
*/
.dns.named-forwarders
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/autodocs-ycp.ami new/yast2-dns-server-2.23.3/autodocs-ycp.ami
--- old/yast2-dns-server-2.23.2/autodocs-ycp.ami 2012-04-24 14:57:19.000000000 +0200
+++ new/yast2-dns-server-2.23.3/autodocs-ycp.ami 2012-06-07 16:10:51.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+# $Id$
# Builds source documentation for YCP sources
# Uses ycpdoc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/configure new/yast2-dns-server-2.23.3/configure
--- old/yast2-dns-server-2.23.2/configure 2012-04-24 14:57:22.000000000 +0200
+++ new/yast2-dns-server-2.23.3/configure 2012-06-07 16:10:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-dns-server 2.23.2.
+# Generated by GNU Autoconf 2.68 for yast2-dns-server 2.23.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-dns-server'
PACKAGE_TARNAME='yast2-dns-server'
-PACKAGE_VERSION='2.23.2'
-PACKAGE_STRING='yast2-dns-server 2.23.2'
+PACKAGE_VERSION='2.23.3'
+PACKAGE_STRING='yast2-dns-server 2.23.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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.23.2 to adapt to many kinds of systems.
+\`configure' configures yast2-dns-server 2.23.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-dns-server 2.23.2:";;
+ short | recursive ) echo "Configuration of yast2-dns-server 2.23.3:";;
esac
cat <<\_ACEOF
@@ -1381,7 +1381,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-dns-server configure 2.23.2
+yast2-dns-server configure 2.23.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1398,7 +1398,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.23.2, which was
+It was created by yast2-dns-server $as_me 2.23.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2328,7 +2328,7 @@
# Define the identity of the package.
PACKAGE='yast2-dns-server'
- VERSION='2.23.2'
+ VERSION='2.23.3'
cat >>confdefs.h <<_ACEOF
@@ -2450,7 +2450,7 @@
-VERSION="2.23.2"
+VERSION="2.23.3"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
@@ -3380,7 +3380,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.23.2, which was
+This file was extended by yast2-dns-server $as_me 2.23.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3433,7 +3433,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-dns-server config.status 2.23.2
+yast2-dns-server config.status 2.23.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/configure.in new/yast2-dns-server-2.23.3/configure.in
--- old/yast2-dns-server-2.23.2/configure.in 2012-04-24 14:57:19.000000000 +0200
+++ new/yast2-dns-server-2.23.3/configure.in 2012-06-07 16:10:51.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-dns-server
dnl
-dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dns-server, 2.23.2, http://bugs.opensuse.org/, yast2-dns-server)
+AC_INIT(yast2-dns-server, 2.23.3, 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.23.2"
+VERSION="2.23.3"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/doc/autodocs/Makefile.in new/yast2-dns-server-2.23.3/doc/autodocs/Makefile.in
--- old/yast2-dns-server-2.23.2/doc/autodocs/Makefile.in 2012-04-24 14:57:22.000000000 +0200
+++ new/yast2-dns-server-2.23.3/doc/autodocs/Makefile.in 2012-06-07 16:10:54.000000000 +0200
@@ -20,7 +20,7 @@
#
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+# $Id$
# Builds source documentation for YCP sources
# Uses ycpdoc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/DnsServer.pm new/yast2-dns-server-2.23.3/src/DnsServer.pm
--- old/yast2-dns-server-2.23.2/src/DnsServer.pm 2012-04-24 14:57:14.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/DnsServer.pm 2012-06-07 16:09:12.000000000 +0200
@@ -911,6 +911,11 @@
sub GetConfigurationStat {
my $class = shift;
+ unless (FileUtils->Exists ($configfile)) {
+ y2error('Cannot stat file '.$configfile.', file does not exist');
+ return undef;
+ }
+
my $ret = SCR->Execute (".target.bash_output",
"stat --format='rights: %a, blocks: %b, size: %s, owner: %u:%g changed: %Z, modifyied: %Y' ".$configfile
);
@@ -989,7 +994,11 @@
Progress->NextStage ();
- y2milestone("Converting configfile: ", SCR->Execute (".dns.named_conf_convert", $configfile));
+ if (FileUtils->Exists ($configfile)) {
+ y2milestone('Converting configfile: ', SCR->Execute ('.dns.named_conf_convert', $configfile));
+ } else {
+ y2error('Config file '.$configfile.' does not exist, file cannot be converted');
+ }
$configuration_timestamp = $self->GetConfigurationStat();
@@ -1811,13 +1820,6 @@
my $ret = 1;
local $Data::Dumper::Indent = 0;
- my $default_config = "ou=ldapconfig,".$ldap_domain;
- my $dc_ret = Ldap->GetLDAPEntry ($default_config);
- y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret));
-
- # Record not found
- $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0);
-
my $dns_zone = "ou=DNS,".$ldap_domain;
my $dz_ret = Ldap->GetLDAPEntry ($dns_zone);
y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret));
@@ -1843,8 +1845,9 @@
|| 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)}))
{
y2milestone ("LDAP server is local, checking included schemas");
- LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1);
- LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1);
+ LdapServerAccess->AddLdapSchemas(
+ ["/etc/openldap/schema/yast.schema", "/etc/openldap/schema/dnszone.schema"],1
+ );
}
else
{
@@ -1897,11 +1900,8 @@
# If non-local server is used, schemas are not handled but required anyway
# BNC #710430 and BNC #690237
- unless (LdapSchemasPresent($ldap_domain)) {
- y2error ("Required schemas not found.");
- Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP."));
- return 0;
- }
+ # Currently just for logging purpose here
+ LdapSchemasPresent($ldap_domain);
# find suseDnsConfiguration object
%ldap_query = (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/DnsServerHelperFunctions.ycp new/yast2-dns-server-2.23.3/src/DnsServerHelperFunctions.ycp
--- old/yast2-dns-server-2.23.2/src/DnsServerHelperFunctions.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/DnsServerHelperFunctions.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Module containing helper functions.
* Authors: Lukas Ocilka
*
- * $Id: DnsServerHelperFunctions.ycp 67408 2012-02-10 12:27:51Z locilka $
+ * $Id$
*
* Module handles dynamic update of zone using 'nsupdate' command.
* Automatic generation of connected zones and much more!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/DnsServerUI.ycp new/yast2-dns-server-2.23.3/src/DnsServerUI.ycp
--- old/yast2-dns-server-2.23.2/src/DnsServerUI.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/DnsServerUI.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of dns-server, input and output functions.
* Authors: Jiri Srain
*
- * $Id: DnsServerUI.ycp 50454 2008-08-28 13:05:07Z locilka $
+ * $Id$
*
* Representation of the configuration of dns-server.
* Input and output routines.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/DnsTsigKeys.pm new/yast2-dns-server-2.23.3/src/DnsTsigKeys.pm
--- old/yast2-dns-server-2.23.2/src/DnsTsigKeys.pm 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/DnsTsigKeys.pm 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: Functions for TSIG keys handling
# Authors: Jiri Srain
#
-# $Id: DnsTsigKeys.pm 21268 2005-02-07 08:25:09Z locilka $
+# $Id$
package DnsTsigKeys;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/DnsZones.pm new/yast2-dns-server-2.23.3/src/DnsZones.pm
--- old/yast2-dns-server-2.23.2/src/DnsZones.pm 2012-04-24 14:57:14.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/DnsZones.pm 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
# Authors: Jiri Srain
# Lukas Ocilka
#
-# $Id: DnsZones.pm 67975 2012-04-20 14:19:54Z locilka $
+# $Id$
#
# Contains routines for handling zone files (both directly and using nsupdate)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/Makefile.in new/yast2-dns-server-2.23.3/src/Makefile.in
--- old/yast2-dns-server-2.23.2/src/Makefile.in 2012-04-24 14:57:22.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/Makefile.in 2012-06-07 16:10:54.000000000 +0200
@@ -603,7 +603,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/cmdline.ycp new/yast2-dns-server-2.23.3/src/cmdline.ycp
--- old/yast2-dns-server-2.23.2/src/cmdline.ycp 2012-04-24 14:57:14.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/cmdline.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -6,7 +6,7 @@
* Summary: Command Line for YaST2 DNS Server
* Authors: Lukas Ocilka
*
- * $Id: cmdline.ycp 67961 2012-04-17 14:58:46Z locilka $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/dialog-installwizard.ycp new/yast2-dns-server-2.23.3/src/dialog-installwizard.ycp
--- old/yast2-dns-server-2.23.2/src/dialog-installwizard.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/dialog-installwizard.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: dialog-installwizard.ycp 66820 2011-11-16 10:56:18Z jsuchome $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/dialog-main.ycp new/yast2-dns-server-2.23.3/src/dialog-main.ycp
--- old/yast2-dns-server-2.23.2/src/dialog-main.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/dialog-main.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: dialog-main.ycp 66820 2011-11-16 10:56:18Z jsuchome $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/dialog-masterzone.ycp new/yast2-dns-server-2.23.3/src/dialog-masterzone.ycp
--- old/yast2-dns-server-2.23.2/src/dialog-masterzone.ycp 2012-04-24 14:57:14.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/dialog-masterzone.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: dialog-masterzone.ycp 68001 2012-04-24 08:43:58Z locilka $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/dialogs.ycp new/yast2-dns-server-2.23.3/src/dialogs.ycp
--- old/yast2-dns-server-2.23.2/src/dialogs.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/dialogs.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Srain
*
- * $Id: dialogs.ycp 50454 2008-08-28 13:05:07Z locilka $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/dns-server.ycp new/yast2-dns-server-2.23.3/src/dns-server.ycp
--- old/yast2-dns-server-2.23.2/src/dns-server.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/dns-server.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: dns-server.ycp 20780 2005-01-17 14:12:38Z locilka $
+ * $Id$
*
* Main file for dns-server configuration. Uses all other files.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/dns-server_auto.ycp new/yast2-dns-server-2.23.3/src/dns-server_auto.ycp
--- old/yast2-dns-server-2.23.2/src/dns-server_auto.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/dns-server_auto.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Jiri Srain
*
- * $Id: dns-server_auto.ycp 20574 2004-12-15 14:22:10Z jsrain $
+ * $Id$
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/helps.ycp new/yast2-dns-server-2.23.3/src/helps.ycp
--- old/yast2-dns-server-2.23.2/src/helps.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/helps.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: helps.ycp 66820 2011-11-16 10:56:18Z jsuchome $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/misc.ycp new/yast2-dns-server-2.23.3/src/misc.ycp
--- old/yast2-dns-server-2.23.2/src/misc.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/misc.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of dns-server.
* Authors: Jiri Srain
*
- * $Id: misc.ycp 49340 2008-07-23 12:16:18Z locilka $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/options.ycp new/yast2-dns-server-2.23.3/src/options.ycp
--- old/yast2-dns-server-2.23.2/src/options.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/options.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Table options and popups used by DNS server configuration
* Authors: Jiri Srain
*
- * $Id: options.ycp 49043 2008-07-14 12:08:08Z locilka $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/src/wizards.ycp new/yast2-dns-server-2.23.3/src/wizards.ycp
--- old/yast2-dns-server-2.23.2/src/wizards.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/src/wizards.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: wizards.ycp 36407 2007-02-22 15:30:56Z locilka $
+ * $Id$
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/DnsServerAPI.out new/yast2-dns-server-2.23.3/testsuite/tests/DnsServerAPI.out
--- old/yast2-dns-server-2.23.2/testsuite/tests/DnsServerAPI.out 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/DnsServerAPI.out 2012-06-07 16:09:12.000000000 +0200
@@ -22,6 +22,7 @@
Dir .dns.named.section: ["options", "zone \"localhost\" in"]
Read .dns.named.value.acl []
Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
+Read .target.ycp "/var/lib/YaST2/yast2-dns-server_reverse-zones" $[]
Read .dns.named.value."zone \"localhost\" in".type ["master"]
Read .dns.named.value."zone \"localhost\" in".file ["\"localhost.zone\""]
Read .dns.zone "/var/lib/named/localhost.zone" $["TTL":"1W", "records":[$["key":"", "type":"NS", "value":"@"], $["key":"", "type":"A", "value":"127.0.0.1"], $["key":"localhost2", "type":"A", "value":"127.0.0.2"]], "soa":$["expiry":"6W", "mail":"root", "minimum":"1W", "refresh":"2D", "retry":"4H", "serial":42, "server":"@", "zone":"@"]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/DnsServerAPI.ycp new/yast2-dns-server-2.23.3/testsuite/tests/DnsServerAPI.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/DnsServerAPI.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/DnsServerAPI.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -116,9 +116,14 @@
],
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
- "ycp" : nil,
+ "ycp" : $[],
"yast2" : $[ "lang2iso.ycp" : $[] ],
"size" : 1,
"string" : "some text",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/Read.out new/yast2-dns-server-2.23.3/testsuite/tests/Read.out
--- old/yast2-dns-server-2.23.2/testsuite/tests/Read.out 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/Read.out 2012-06-07 16:09:12.000000000 +0200
@@ -1,7 +1,6 @@
Dump =======================
-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 .target.bash "/etc/init.d/named status" 1
+Execute .target.bash "/etc/init.d/named stop" 1
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
@@ -14,6 +13,7 @@
Dir .dns.named.section: ["options", "zone \"localhost\" in"]
Read .dns.named.value.acl []
Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES 0
+Read .target.ycp "/var/lib/YaST2/yast2-dns-server_reverse-zones" $[]
Read .dns.named.value."zone \"localhost\" in".type ["master"]
Read .dns.named.value."zone \"localhost\" in".file ["\"localhost.zone\""]
Read .dns.zone "/var/lib/named/localhost.zone" $["TTL":"1W", "records":[$["key":"", "type":"NS", "value":"@"], $["key":"", "type":"A", "value":"127.0.0.1"], $["key":"localhost2", "type":"A", "value":"127.0.0.2"]], "soa":$["expiry":"6W", "mail":"root", "minimum":"1W", "refresh":"2D", "retry":"4H", "serial":42, "server":"@", "zone":"@"]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/Read.ycp new/yast2-dns-server-2.23.3/testsuite/tests/Read.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/Read.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/Read.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: Read.ycp 49930 2008-08-11 11:17:52Z locilka $
+ * $Id$
*
* Testsuite for reading configuration for dns-server
*/
@@ -56,8 +56,14 @@
"displaymanager" : $["DISPLAYMANAGER":""],
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
+ "ycp" : $[],
],
];
map I_WRITE = $[];
@@ -131,7 +137,12 @@
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"ycp" : $[],
],
"dns" : $[
@@ -203,14 +214,21 @@
"target" : $[
"yast2" : $[ "lang2iso.ycp" : $[] ],
"size" : 1,
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
+ "ycp" : $[],
],
];
map WRITE = $[];
map EXEC = $[
"target" : $[
"bash_output" : $["exit" : 1, "stdout" : "", "stderr" : ""],
+ "bash" : 1,
],
"passwd" : $[ "init" : true ],
];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/Write.ycp new/yast2-dns-server-2.23.3/testsuite/tests/Write.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/Write.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/Write.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: Write.ycp 65651 2011-09-12 12:22:21Z lslezak $
+ * $Id$
*
* Testsuite for writting configuration for dns-server
*/
@@ -48,8 +48,15 @@
"ROOT_USES_LANG" : "ctype",
],
],
- "target" : $[ "yast2" : $[ "lang2iso.ycp" : $[] ],
- "stat" : $["isreg" : true]
+ "target" : $[
+ "yast2" : $[ "lang2iso.ycp" : $[] ],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
+ "ycp" : $[],
],
];
map I_WRITE = $[];
@@ -108,6 +115,15 @@
],
],
],
+ "target" : $[
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
+ "ycp" : $[],
+ ],
"dns" : $[
"named" : $[
"section" : $[
@@ -164,8 +180,15 @@
"ROOT_USES_LANG" : "ctype",
],
],
- "target" : $[ "yast2" : $[ "lang2iso.ycp" : $[] ],
- "stat" : $[ "isreg" : true ],
+ "target" : $[
+ "yast2" : $[ "lang2iso.ycp" : $[] ],
+ "ycp" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
],
];
map WRITE = $[];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadGlobalOptions.out new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadGlobalOptions.out
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadGlobalOptions.out 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadGlobalOptions.out 2012-06-07 16:09:12.000000000 +0200
@@ -14,6 +14,7 @@
Dir .dns.named.section: ["options", "zone \"localhost\" in"]
Read .dns.named.value.acl []
Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
+Read .target.ycp "/var/lib/YaST2/yast2-dns-server_reverse-zones" $[]
Read .dns.named.value."zone \"localhost\" in".type ["master"]
Read .dns.named.value."zone \"localhost\" in".file ["\"localhost.zone\""]
Read .dns.zone "/var/lib/named/localhost.zone" $["TTL":"1W", "records":[$["key":"", "type":"NS", "value":"@"], $["key":"", "type":"A", "value":"127.0.0.1"], $["key":"localhost2", "type":"A", "value":"127.0.0.2"]], "soa":$["expiry":"6W", "mail":"root", "minimum":"1W", "refresh":"2D", "retry":"4H", "serial":42, "server":"@", "zone":"@"]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadGlobalOptions.ycp new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadGlobalOptions.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadGlobalOptions.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadGlobalOptions.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIReadGlobalOptions.ycp 49930 2008-08-11 11:17:52Z locilka $
+ * $Id$
*
* Testsuite for reading global options for dns-server
*/
@@ -52,8 +52,14 @@
"target" : $[
"yast2" : $[ "lang2iso.ycp" : $[] ],
"size" : 1,
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
+ "ycp" : $[],
],
];
map I_WRITE = $[];
@@ -115,7 +121,12 @@
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"ycp" : $[],
"lstat" : $[],
],
@@ -179,10 +190,16 @@
],
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
"yast2" : $[ "lang2iso.ycp" : $[] ],
"size" : 1,
+ "ycp" : $[],
],
];
map WRITE = $[];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadZones.out new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadZones.out
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadZones.out 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadZones.out 2012-06-07 16:09:12.000000000 +0200
@@ -14,6 +14,7 @@
Dir .dns.named.section: ["options", "zone \"localhost\" in"]
Read .dns.named.value.acl []
Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
+Read .target.ycp "/var/lib/YaST2/yast2-dns-server_reverse-zones" $[]
Read .dns.named.value."zone \"localhost\" in".type ["master"]
Read .dns.named.value."zone \"localhost\" in".file ["\"localhost.zone\""]
Read .dns.zone "/var/lib/named/localhost.zone" $["TTL":"1W", "records":[$["key":"", "type":"NS", "value":"@"], $["key":"", "type":"A", "value":"127.0.0.1"], $["key":"localhost2", "type":"A", "value":"127.0.0.2"]], "soa":$["expiry":"6W", "mail":"root", "minimum":"1W", "refresh":"2D", "retry":"4H", "serial":42, "server":"@", "zone":"@"]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadZones.ycp new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadZones.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIReadZones.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIReadZones.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIReadZones.ycp 49930 2008-08-11 11:17:52Z locilka $
+ * $Id$
*
* Testsuite for reading dns zones for dns-server
*/
@@ -51,8 +51,14 @@
],
"target" : $[
"yast2" : $[ "lang2iso.ycp" : $[] ],
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
+ "ycp" : $[],
],
];
map I_WRITE = $[];
@@ -115,7 +121,12 @@
"target" : $[
"ycp" : $[],
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
],
"dns" : $[
@@ -178,10 +189,16 @@
],
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
"yast2" : $[ "lang2iso.ycp" : $[] ],
"size" : 1,
+ "ycp" : $[],
],
];
map WRITE = $[];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIStartStopDnsService.ycp new/yast2-dns-server-2.23.3/testsuite/tests/YaPIStartStopDnsService.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIStartStopDnsService.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIStartStopDnsService.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIStartStopDnsService.ycp 20077 2004-11-01 07:57:39Z locilka $
+ * $Id$
*
* Testsuite for starting/stopping dns-server
*/
@@ -49,7 +49,15 @@
"ROOT_USES_LANG" : "ctype",
],
],
- "target" : $[ "yast2" : $[ "lang2iso.ycp" : $[] ] ],
+ "target" : $[
+ "yast2" : $[ "lang2iso.ycp" : $[] ],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
+ ],
];
map I_WRITE = $[];
map I_EXEC = $[];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteGlobalOptions.out new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteGlobalOptions.out
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteGlobalOptions.out 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteGlobalOptions.out 2012-06-07 16:09:12.000000000 +0200
@@ -1,7 +1,6 @@
Dump ==========================================================
-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 .target.bash "/etc/init.d/named status" 1
+Execute .target.bash "/etc/init.d/named stop" 1
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
@@ -14,6 +13,7 @@
Dir .dns.named.section: ["options", "zone \"localhost\" in"]
Read .dns.named.value.acl []
Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
+Read .target.ycp "/var/lib/YaST2/yast2-dns-server_reverse-zones" $[]
Read .dns.named.value."zone \"localhost\" in".type ["master"]
Read .dns.named.value."zone \"localhost\" in".file ["\"localhost.zone\""]
Read .dns.zone "/var/lib/named/localhost.zone" $["TTL":"1W", "records":[$["key":"", "type":"NS", "value":"@"], $["key":"", "type":"A", "value":"127.0.0.1"], $["key":"localhost2", "type":"A", "value":"127.0.0.2"]], "soa":$["expiry":"6W", "mail":"root", "minimum":"1W", "refresh":"2D", "retry":"4H", "serial":42, "server":"@", "zone":"@"]]
@@ -50,7 +50,7 @@
Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "bind" true
Write .sysconfig.network.config nil true
Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""]
-Execute .target.bash "/etc/init.d/named stop" 0
+Execute .target.bash "/etc/init.d/named stop" 1
Write .target.ycp "/var/lib/YaST2/dns_server" $[] true
Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true
Write .sysconfig.network.config nil true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteGlobalOptions.ycp new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteGlobalOptions.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteGlobalOptions.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteGlobalOptions.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIWriteGlobalOptions.ycp 49930 2008-08-11 11:17:52Z locilka $
+ * $Id$
*
* Testsuite for writting global options for dns-server
*/
@@ -102,7 +102,12 @@
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
"ycp" : $[],
],
@@ -171,16 +176,23 @@
],
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
"yast2" : $[ "lang2iso.ycp" : $[] ],
"size" : 1,
+ "ycp" : $[],
],
];
map WRITE = $[];
map EXEC = $[
"target" : $[
"bash_output" : $["exit" : 1, "stdout" : "", "stderr" : ""],
+ "bash" : 1,
],
"passwd" : $[ "init" : true ],
];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteZones.out new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteZones.out
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteZones.out 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteZones.out 2012-06-07 16:09:12.000000000 +0200
@@ -1,7 +1,6 @@
Dump ==========================================================
-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 .target.bash "/etc/init.d/named status" 1
+Execute .target.bash "/etc/init.d/named stop" 1
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
@@ -14,6 +13,7 @@
Dir .dns.named.section: ["options", "zone \"localhost\" in"]
Read .dns.named.value.acl []
Read .sysconfig.named.NAMED_CONF_INCLUDE_FILES nil
+Read .target.ycp "/var/lib/YaST2/yast2-dns-server_reverse-zones" $[]
Read .dns.named.value."zone \"localhost\" in".type ["master"]
Read .dns.named.value."zone \"localhost\" in".file ["\"localhost.zone\""]
Read .dns.zone "/var/lib/named/localhost.zone" $["TTL":"1W", "records":[$["key":"", "type":"NS", "value":"@"], $["key":"", "type":"A", "value":"127.0.0.1"], $["key":"localhost2", "type":"A", "value":"127.0.0.2"]], "soa":$["expiry":"6W", "mail":"root", "minimum":"1W", "refresh":"2D", "retry":"4H", "serial":42, "server":"@", "zone":"@"]]
@@ -56,7 +56,7 @@
Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "bind" true
Write .sysconfig.network.config nil true
Execute .target.bash_output "/sbin/netconfig update" $["exit":1, "stderr":"", "stdout":""]
-Execute .target.bash "/etc/init.d/named stop" 0
+Execute .target.bash "/etc/init.d/named stop" 1
Write .target.ycp "/var/lib/YaST2/dns_server" $[] true
Write .sysconfig.network.config.NETCONFIG_DNS_FORWARDER "resolver" true
Write .sysconfig.network.config nil true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteZones.ycp new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteZones.ycp
--- old/yast2-dns-server-2.23.2/testsuite/tests/YaPIWriteZones.ycp 2012-04-17 11:18:00.000000000 +0200
+++ new/yast2-dns-server-2.23.3/testsuite/tests/YaPIWriteZones.ycp 2012-06-07 16:09:12.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain , Lukas Ocilka
* Copyright: Copyright 2004, Novell, Inc. All rights reserved.
*
- * $Id: YaPIWriteZones.ycp 49930 2008-08-11 11:17:52Z locilka $
+ * $Id$
*
* Testsuite for reading configuration for dns-server
*/
@@ -49,9 +49,15 @@
],
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
- "yast2" : $[ "lang2iso.ycp" : $[] ]
+ "yast2" : $[ "lang2iso.ycp" : $[] ],
+ "ycp" : $[],
],
];
map I_WRITE = $[];
@@ -113,7 +119,12 @@
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
"ycp" : $[],
],
@@ -177,16 +188,23 @@
],
],
"target" : $[
- "stat" : $[],
+ "stat" : $[
+ "atime":1101890288, "ctime":1101890286, "gid":0, "inode":29236,
+ "isblock":false, "ischr":false, "isdir":false, "isfifo":false,
+ "islink":false, "isreg":true, "issock":false,
+ "mtime":1101890286, "nlink":1, "size":804, "uid":0
+ ],
"lstat" : $[],
"yast2" : $[ "lang2iso.ycp" : $[] ],
"size" : 1,
+ "ycp" : $[],
],
];
map WRITE = $[];
map EXEC = $[
"target" : $[
"bash_output" : $["exit" : 1, "stdout" : "", "stderr" : ""],
+ "bash" : 1,
],
"passwd" : $[ "init" : true ],
];
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org