Hello community,
here is the log from the commit of package yast2-dns-server
checked in at Wed Aug 30 23:37:29 CEST 2006.
--------
--- yast2-dns-server/yast2-dns-server.changes 2006-08-04 16:12:55.000000000 +0200
+++ yast2-dns-server/yast2-dns-server.changes 2006-08-30 15:33:09.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 30 15:32:35 CEST 2006 - locilka@suse.cz
+
+- DnsServerPunycode renamed to Punycode and moved to yast2-2.13.78.
+- 2.13.17
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-2.13.16.tar.bz2
New:
----
yast2-dns-server-2.13.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.IWxttb/_old 2006-08-30 23:37:24.000000000 +0200
+++ /var/tmp/diff_new_pack.IWxttb/_new 2006-08-30 23:37:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dns-server (Version 2.13.16)
+# spec file for package yast2-dns-server (Version 2.13.17)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,15 +11,17 @@
# norootforbuild
Name: yast2-dns-server
-Version: 2.13.16
+Version: 2.13.17
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dns-server-2.13.16.tar.bz2
+Source0: yast2-dns-server-2.13.17.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
+# DnsServerPunycode renamed to Punycode and moved to yast2.rpm
+Requires: yast2 >= 2.13.78
BuildArchitectures: noarch
Summary: YaST2 - DNS Server Configuration
@@ -31,9 +33,10 @@
Authors:
--------
Jiri Srain
+ Lukas Ocilka
%prep
-%setup -n yast2-dns-server-2.13.16
+%setup -n yast2-dns-server-2.13.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +79,9 @@
%doc %{prefix}/share/doc/packages/yast2-dns-server
%changelog -n yast2-dns-server
+* Wed Aug 30 2006 - locilka@suse.cz
+- DnsServerPunycode renamed to Punycode and moved to yast2-2.13.78.
+- 2.13.17
* Fri Aug 04 2006 - locilka@suse.cz
- Added new function IsServiceConfigurableExternally() to the
DnsServerAPI module to be used from external modules like
++++++ yast2-dns-server-2.13.16.tar.bz2 -> yast2-dns-server-2.13.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/VERSION new/yast2-dns-server-2.13.17/VERSION
--- old/yast2-dns-server-2.13.16/VERSION 2006-08-04 16:13:01.000000000 +0200
+++ new/yast2-dns-server-2.13.17/VERSION 2006-08-30 15:32:14.000000000 +0200
@@ -1 +1 @@
-2.13.16
+2.13.17
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/configure new/yast2-dns-server-2.13.17/configure
--- old/yast2-dns-server-2.13.16/configure 2006-08-04 16:19:32.000000000 +0200
+++ new/yast2-dns-server-2.13.17/configure 2006-08-30 15:42:27.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.16.
+# Generated by GNU Autoconf 2.59 for yast2-dns-server 2.13.17.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-dns-server'
PACKAGE_TARNAME='yast2-dns-server'
-PACKAGE_VERSION='2.13.16'
-PACKAGE_STRING='yast2-dns-server 2.13.16'
+PACKAGE_VERSION='2.13.17'
+PACKAGE_STRING='yast2-dns-server 2.13.17'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
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.16 to adapt to many kinds of systems.
+\`configure' configures yast2-dns-server 2.13.17 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.16:";;
+ short | recursive ) echo "Configuration of yast2-dns-server 2.13.17:";;
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.16
+yast2-dns-server configure 2.13.17
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.16, which was
+It was created by yast2-dns-server $as_me 2.13.17, 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.16'
+ VERSION='2.13.17'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.16"
+VERSION="2.13.17"
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.16, which was
+This file was extended by yast2-dns-server $as_me 2.13.17, 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.16
+yast2-dns-server config.status 2.13.17
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.16/configure.in new/yast2-dns-server-2.13.17/configure.in
--- old/yast2-dns-server-2.13.16/configure.in 2006-08-04 16:19:29.000000000 +0200
+++ new/yast2-dns-server-2.13.17/configure.in 2006-08-30 15:42:22.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dns-server, 2.13.16, http://bugs.opensuse.org/, yast2-dns-server)
+AC_INIT(yast2-dns-server, 2.13.17, http://bugs.opensuse.org/, 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.16"
+VERSION="2.13.17"
RPMNAME="yast2-dns-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/DnsServerPunycode.ycp new/yast2-dns-server-2.13.17/src/DnsServerPunycode.ycp
--- old/yast2-dns-server-2.13.16/src/DnsServerPunycode.ycp 2006-07-27 16:36:32.000000000 +0200
+++ new/yast2-dns-server-2.13.17/src/DnsServerPunycode.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,376 +0,0 @@
-/**
- * File: modules/DnsServerPunycode.ycp
- * Package: Configuration of dns-server
- * Summary: DNS Punycode Handling
- * Authors: Lukas Ocilka
- * Tags: Unstable
- *
- * $Id:$
- *
- * Representation of the configuration of dns-server.
- * Input and output routines.
- */
-
-{
-
- module "DnsServerPunycode";
- textdomain "dns-server";
-
- string tmp_dir = nil;
-
- // string, matching this regexp, is not cached
- string not_cached_regexp = "^[0123456789\.]*$";
-
- //
- // Encoded string in cache has the same index
- // as its Decoded format in the second list.
- //
-
- // list of encoded strings to be cached (Punycode or Unicode)
- list <string> cache_encoded = [];
- // list of decoded strings to be cached (Unicode or Punycode)
- list <string> cache_decoded = [];
-
- integer current_cache_index = 0;
-
- // cached amount of data should be controled
- integer current_cache_size = 0;
- integer maximum_cache_size = 32768;
-
- /**
- * Returns the maximum cache size (sum of already converted
- * strings).
- *
- * @return integer maximum_cache_size
- * @see SetMaximumCacheSize()
- */
- global define integer GetMaximumCacheSize () {
- return maximum_cache_size;
- }
-
- /**
- * Offers to set the maximum cache size (sum of already
- * converted strings).
- *
- * @param integer new_max_size
- * @see GetMaximumCacheSize()
- */
- global define void SetMaximumCacheSize (integer new_max_size) {
- if (new_max_size != nil) {
- maximum_cache_size = new_max_size;
- } else {
- y2error("Cannot set MaximumCacheSize to nil!");
- }
- }
-
- /**
- * Adds new cache records for encoded and decoded strings.
- *
- * @params string decoded
- * @params string encoded
- */
- define void CreateNewCacheRecord (string decoded, string encoded) {
- // Erroneous cache record
- if (decoded == nil || encoded == nil) return;
-
- // Already cached
- if (contains(cache_decoded, decoded)) return;
-
- integer decoded_size = size(decoded);
- integer encoded_size = size(encoded);
-
- // Do not store this record if the cache would exceed maximum
- if ((current_cache_size + decoded_size + encoded_size) > maximum_cache_size) return;
-
- current_cache_size = current_cache_size + decoded_size + encoded_size;
- cache_decoded[current_cache_index] = decoded;
- cache_encoded[current_cache_index] = encoded;
- current_cache_index = current_cache_index + 1;
- }
-
- /**
- * Returns string encoded in Punycode if it has been
- * already cached. Returns nil if not found.
- *
- * @param string decoded_string (Unicode)
- * @return string encoded_string (Punycode)
- */
- define string GetEncodedCachedString (string decoded_string) {
- string ret = nil;
-
- // numbers and empty strings are not converted
- if (regexpmatch(decoded_string, not_cached_regexp)) {
- return decoded_string;
- }
-
- integer counter = -1;
- // searching through decoded strings to find the index
- foreach (string cached_string, cache_decoded, {
- counter = counter + 1;
- if (cached_string == decoded_string) {
- // returning encoded representation
- ret = cache_encoded[counter]:nil;
- break;
- }
- });
-
- return ret;
- }
-
- /**
- * Returns string encoded in Punycode if it has been
- * already cached. Returns nil if not found.
- *
- * @param string encoded_string (Punycode)
- * @return string decoded_string (Unicode)
- */
- define string GetDecodedCachedString (string encoded_string) {
- string ret = nil;
-
- // numbers and empty strings are not converted
- if (regexpmatch(encoded_string, not_cached_regexp)) {
- return encoded_string;
- }
-
- integer counter = -1;
- // searching through encoded strings to find the index
- foreach (string cached_string, cache_encoded, {
- counter = counter + 1;
- if (cached_string == encoded_string) {
- // returning decoded representation
- ret = cache_decoded[counter]:nil;
- break;
- }
- });
-
- return ret;
- }
-
- /**
- * Returns the current temporary directory.
- * Lazy loading for the initialization is used.
- */
- define string GetTmpDirectory () {
- if (tmp_dir == nil) {
- tmp_dir = (string) SCR::Read(.target.tmpdir);
- }
-
- return tmp_dir;
- }
-
- /**
- * Function takes the list of strings and returns them in the converted
- * format. Unicode to Punycode or Punycode to Unicode (param to_punycode).
- * It uses a cache of already-converted strings.
- */
- define list <string> ConvertBackAndForth (list <string> strings_in, boolean to_punycode) {
- // list of returned strings
- list <string> strings_out = [];
-
- // Some (or maybe all) strings needn't be cached
- list <string> not_cached = [];
-
- // Check the cache for already entered strings
- integer current_index = -1;
- map test_cached = listmap (string string_in, strings_in, {
- string string_out = nil;
-
- // Numbers, IPs and empty strings are not converted
- if (regexpmatch(string_in, not_cached_regexp)) {
- string_out = string_in;
- } else {
- if (to_punycode) {
- string_out = GetEncodedCachedString(string_in);
- } else {
- string_out = GetDecodedCachedString(string_in);
- }
- }
-
- if (string_out == nil) {
- current_index = current_index + 1;
- not_cached[current_index] = string_in;
- }
-
- return $[string_in : string_out];
- });
-
- list <string> converted_not_cached = [];
-
- // There is something not cached, converting them at once
- if (not_cached != []) {
- string tmp_in = GetTmpDirectory() + "/tmp-idnconv-in.ycp";
- string tmp_out = GetTmpDirectory() + "/tmp-idnconv-out.ycp";
-
- SCR::Write(.target.ycp, tmp_in, not_cached);
- string convert_command = sformat(
- "/usr/bin/idnconv %1 %2 > %3",
- (to_punycode ? "":"-reverse"), tmp_in, tmp_out
- );
-
- if ((integer) SCR::Execute(.target.bash, convert_command) != 0) {
- y2error("Conversion failed!");
- } else {
- converted_not_cached = (list <string>) SCR::Read(.target.ycp, tmp_out);
- // Parsing the YCP file failed
- if (converted_not_cached == nil) {
- y2error("Erroneous YCP file: %1", SCR::Read(.target.string, tmp_out));
- }
- }
- }
-
- // Listing through the given list and adjusting the return list
- current_index = -1;
- integer found_index = -1;
- foreach (string string_in, strings_in, {
- current_index = current_index + 1;
-
- // Already cached string
- if (test_cached[string_in]:nil != nil) {
- strings_out[current_index] = test_cached[string_in]:"";
-
- // Recently converted strings
- } else {
- found_index = found_index + 1;
- strings_out[current_index] = converted_not_cached[found_index]:"";
-
- // Adding converted strings to cache
- if (to_punycode) {
- CreateNewCacheRecord(string_in, converted_not_cached[found_index]:"");
- } else {
- CreateNewCacheRecord(converted_not_cached[found_index]:"", string_in);
- }
- }
- });
-
- return strings_out;
- }
-
- /**
- * Converts list of UTF-8 strings into their Punycode
- * ASCII repserentation.
- *
- * @param list <string> punycode_strings
- * @return list <string> encoded_strings
- */
- global define list <string> EncodePunycodes (list <string> punycode_strings) {
- return ConvertBackAndForth(punycode_strings, true);
- }
-
- /**
- * Converts list of Punycode strings into their UTF-8
- * representation.
- *
- * @param list <string> punycode_strings
- * @return list <string> decoded_strings
- */
- global define list <string> DecodePunycodes (list <string> punycode_strings) {
- return ConvertBackAndForth(punycode_strings, false);
- }
-
- /**
- * Encodes the domain name (relative or FQDN) to the Punycode.
- *
- * @param string decoded domain_name
- * @return string encoded domain_name
- *
- * @example
- * EncodeDomainName("žížala.jůlinka.go.home")
- * -> "xn--ala-qma83eb.xn--jlinka-3mb.go.home"
- */
- global define string EncodeDomainName (string decoded_domain_name) {
- return mergestring(
- EncodePunycodes(
- splitstring(decoded_domain_name, ".")
- ),
- "."
- );
- }
-
- /**
- * Decodes the domain name (relative or FQDN) from the Punycode.
- *
- * @param string encoded_domain_name
- * @return string decoded domain_name
- *
- * @example
- * DecodeDomainName("xn--ala-qma83eb.xn--jlinka-3mb.go.home")
- * -> "žížala.jůlinka.go.home"
- */
- global define string DecodeDomainName (string encoded_domain_name) {
- return mergestring(
- DecodePunycodes(
- splitstring(encoded_domain_name, ".")
- ),
- "."
- );
- }
-
- /**
- * Decodes the list of domain names to their Unicode representation.
- * This function is similar to DecodePunycodes but it works with every
- * string as a domain name (that means every domain name is parsed
- * by dots and separately evaluated).
- *
- * @param list <string> encoded_domain_names
- * @return list <string> decoded_domain_names
- *
- * @example
- * DocodeDomainNames(["mx1.example.org", "xp3.example.org.", "xn--ala-qma83eb.org.example."])
- * -> ["mx1.example.org", "xp3.example.org.", "žížala.org.example."]
- */
- global define list <string> DocodeDomainNames (list <string> encoded_domain_names) {
- list <string> decoded_domain_names = [];
- list <string> strings_to_decode = [];
-
- // $[0 : [0, 2], 1 : [3, 5]]
- map backward_map_of_conversion = $[];
-
- integer current_domain_index = -1;
- integer current_domain_item = 0;
-
- // parsing all domain names one by one
- foreach (string one_domain_name, encoded_domain_names, {
- current_domain_index = current_domain_index + 1;
- integer start = current_domain_item;
-
- // parsing the domain name by dots
- foreach (string domain_item, splitstring(one_domain_name, "."), {
- strings_to_decode[current_domain_item] = domain_item;
- current_domain_item = current_domain_item + 1;
- });
- // creating backward index
- backward_map_of_conversion[current_domain_index] = [start, (current_domain_item-1)];
- });
-
- // Transformating strings to the decoded format
- strings_to_decode = DnsServerPunycode::DecodePunycodes(strings_to_decode);
-
- current_domain_index = -1;
- foreach (string one_encoded, encoded_domain_names, {
- current_domain_index = current_domain_index + 1;
-
- // Where the current string starts and ends
- integer current = backward_map_of_conversion[current_domain_index, 0]:nil;
- integer end = backward_map_of_conversion[current_domain_index, 1]:nil;
-
- // error?
- if (current == nil || end == nil) {
- y2error("Cannot find start/end for %1 in %2",
- one_encoded, backward_map_of_conversion[current_domain_index]:nil
- );
- decoded_domain_names[current_domain_index] = one_encoded;
- } else {
- // create a list of items of the current domain (translated)
- list <string> decoded_domain = [];
- while (current <= end) {
- decoded_domain = add(decoded_domain, strings_to_decode[current]:"");
- current = current + 1;
- }
- // create a domain name from these strings
- decoded_domain_names[current_domain_index] = mergestring(decoded_domain, ".");
- }
- });
-
- return decoded_domain_names;
- }
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/Makefile.am new/yast2-dns-server-2.13.17/src/Makefile.am
--- old/yast2-dns-server-2.13.16/src/Makefile.am 2006-07-26 15:57:15.000000000 +0200
+++ new/yast2-dns-server-2.13.17/src/Makefile.am 2006-08-30 15:18:26.000000000 +0200
@@ -33,8 +33,7 @@
DnsTsigKeys.pm \
DnsServerUI.ycp \
DnsFakeTabs.ycp \
- DnsServerAPI.pm \
- DnsServerPunycode.ycp
+ DnsServerAPI.pm
YaPI_perldir = @moduledir@/YaPI
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/Makefile.in new/yast2-dns-server-2.13.17/src/Makefile.in
--- old/yast2-dns-server-2.13.16/src/Makefile.in 2006-08-04 16:19:33.000000000 +0200
+++ new/yast2-dns-server-2.13.17/src/Makefile.in 2006-08-30 15:42:28.000000000 +0200
@@ -205,8 +205,7 @@
DnsTsigKeys.pm \
DnsServerUI.ycp \
DnsFakeTabs.ycp \
- DnsServerAPI.pm \
- DnsServerPunycode.ycp
+ DnsServerAPI.pm
YaPI_perldir = @moduledir@/YaPI
YaPI_perl_DATA = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/dialog-main.ycp new/yast2-dns-server-2.13.17/src/dialog-main.ycp
--- old/yast2-dns-server-2.13.16/src/dialog-main.ycp 2006-07-28 12:24:05.000000000 +0200
+++ new/yast2-dns-server-2.13.17/src/dialog-main.ycp 2006-08-30 15:33:26.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: dialog-main.ycp 32043 2006-07-28 10:25:33Z locilka $
+ * $Id: dialog-main.ycp 32634 2006-08-30 13:35:02Z locilka $
*/
{
@@ -34,7 +34,7 @@
import "Hostname";
import "Confirm";
import "DnsServerAPI";
-import "DnsServerPunycode";
+import "Punycode";
/* String defines the initial screen for the expert dialog */
string initial_screen = "start_up";
@@ -1389,7 +1389,7 @@
list <string> encoded_zone_names = maplist (map z, zones, {
return z["zone"]:"";
});
- list <string> decoded_zone_names = DnsServerPunycode::DocodeDomainNames(encoded_zone_names);
+ list <string> decoded_zone_names = Punycode::DocodeDomainNames(encoded_zone_names);
integer index = -1;
// Creating map $[encoded:decoded]
map enc_to_dec = listmap (string enc_zone, encoded_zone_names, {
@@ -1485,7 +1485,7 @@
string zone_type = (string)
UI::QueryWidget (`id ("new_zone_type"), `Value);
- string encoded_zone_name = DnsServerPunycode::EncodeDomainName(zone_name);
+ string encoded_zone_name = Punycode::EncodeDomainName(zone_name);
// zone validation
if ( Hostname::CheckDomain (encoded_zone_name) != true )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/dialog-masterzone.ycp new/yast2-dns-server-2.13.17/src/dialog-masterzone.ycp
--- old/yast2-dns-server-2.13.16/src/dialog-masterzone.ycp 2006-08-03 11:06:29.000000000 +0200
+++ new/yast2-dns-server-2.13.17/src/dialog-masterzone.ycp 2006-08-30 15:33:26.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain ,
* Lukas Ocilka
*
- * $Id: dialog-masterzone.ycp 32043 2006-07-28 10:25:33Z locilka $
+ * $Id: dialog-masterzone.ycp 32634 2006-08-30 13:35:02Z locilka $
*/
{
@@ -333,7 +333,7 @@
`id ("name_server_list"),
// selection box label
_("Na&me Server List"),
- DnsServerPunycode::DocodeDomainNames(current_zone_ns)
+ Punycode::DocodeDomainNames(current_zone_ns)
)
);
}
@@ -396,7 +396,7 @@
// NS is converted to the Punycode first
string new_ns_entered = (string)
UI::QueryWidget (`id ("add_name_server"), `Value);
- string new_ns = DnsServerPunycode::EncodeDomainName(new_ns_entered);
+ string new_ns = Punycode::EncodeDomainName(new_ns_entered);
y2milestone("New NS: %1", new_ns);
string check_ns = new_ns;
@@ -510,7 +510,7 @@
}
void RedrawMxListWidget () {
- list <string> zone_mx_decoded = DnsServerPunycode::DocodeDomainNames(current_zone_mx);
+ list <string> zone_mx_decoded = Punycode::DocodeDomainNames(current_zone_mx);
integer index = -1;
// create term items using already translated strings
@@ -585,7 +585,7 @@
{
string new_mx_decoded = (string)
UI::QueryWidget (`id ("add_mail_server"), `Value);
- string new_mx = DnsServerPunycode::EncodeDomainName(new_mx_decoded);
+ string new_mx = Punycode::EncodeDomainName(new_mx_decoded);
integer prio = (integer)UI::QueryWidget (`id ("add_priority"), `Value);
// maximal priority is 65535
@@ -950,7 +950,7 @@
void RedrawZonesTable () {
integer index = -1;
string zone_name = current_zone["zone"]:"";
- string decoded_zone_name = DnsServerPunycode::DecodeDomainName(zone_name);
+ string decoded_zone_name = Punycode::DecodeDomainName(zone_name);
list<integer> ret = maplist (map m, current_zone["records"]:[], {
index = index + 1;
@@ -983,7 +983,7 @@
}), {
decoded_names = add (decoded_names, record);
});
- decoded_names = DnsServerPunycode::DecodePunycodes(decoded_names);
+ decoded_names = Punycode::DecodePunycodes(decoded_names);
integer counter = -1;
list items = maplist (integer r, ret, {
@@ -1009,14 +1009,14 @@
UI::QueryWidget (`id ("records_list"), `CurrentItem );
UI::ChangeWidget (`id ("add_record_name"), `Value,
ToRelativeName(
- DnsServerPunycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone_name
+ Punycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone_name
)
);
UI::ChangeWidget (`id ("add_record_type"), `Value,
current_zone["records", r, "type"]:"");
UI::ChangeWidget (`id ("add_record_val"), `Value,
ToRelativeName(
- DnsServerPunycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone_name
+ Punycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone_name
)
);
}
@@ -1192,28 +1192,28 @@
UI::QueryWidget (`id ("add_record_type"), `Value);
// translating new record key and val
- string key = DnsServerPunycode::EncodeDomainName(
+ string key = Punycode::EncodeDomainName(
(string) UI::QueryWidget (`id ("add_record_name"), `Value)
);
- string val = DnsServerPunycode::EncodeDomainName(
+ string val = Punycode::EncodeDomainName(
(string) UI::QueryWidget (`id ("add_record_val"), `Value)
);
string zone = current_zone["zone"]:"";
- string decoded_zone = DnsServerPunycode::DecodeDomainName(zone);
+ string decoded_zone = Punycode::DecodeDomainName(zone);
if (ret == "records_list")
{
UI::ChangeWidget (`id ("add_record_name"), `Value,
ToRelativeName(
- DnsServerPunycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone
+ Punycode::DecodeDomainName(current_zone["records", r, "key"]:""), decoded_zone
)
);
UI::ChangeWidget (`id ("add_record_type"), `Value,
current_zone["records", r, "type"]:"");
UI::ChangeWidget (`id ("add_record_val"), `Value,
ToRelativeName(
- DnsServerPunycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone
+ Punycode::DecodeDomainName(current_zone["records", r, "value"]:""), decoded_zone
)
);
}
@@ -1498,7 +1498,7 @@
// Label - connected with Textentry which shows current edited zone
`HSquash ( `Label ( _("Settings for Zone") ) ),
`HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "",
- DnsServerPunycode::DecodeDomainName(zone_name)
+ Punycode::DecodeDomainName(zone_name)
) ),
`HStretch ()
),
@@ -1627,7 +1627,7 @@
// Label - connected with Textentry which shows current edited zone
`HSquash ( `Label ( _("Settings for Zone") ) ),
`HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "",
- DnsServerPunycode::DecodeDomainName(zone_name)
+ Punycode::DecodeDomainName(zone_name)
) ),
`HStretch ()
),
@@ -1799,7 +1799,7 @@
// Label - connected with Textentry which shows current edited zone
`HSquash ( `Label ( _("Settings for Zone") ) ),
`HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "",
- DnsServerPunycode::DecodeDomainName(zone_name)
+ Punycode::DecodeDomainName(zone_name)
) ),
`HStretch ()
),
@@ -1873,7 +1873,7 @@
y2milestone("Zone %1 (%2), Forwarders: %3",
current_zone["zone"]:"",
- DnsServerPunycode::DecodeDomainName(current_zone["zone"]:""),
+ Punycode::DecodeDomainName(current_zone["zone"]:""),
current_zone_forwarders
);
current_zone["modified"] = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.13.16/src/dialogs.ycp new/yast2-dns-server-2.13.17/src/dialogs.ycp
--- old/yast2-dns-server-2.13.16/src/dialogs.ycp 2006-07-26 17:04:21.000000000 +0200
+++ new/yast2-dns-server-2.13.17/src/dialogs.ycp 2006-08-30 15:33:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Srain
*
- * $Id: dialogs.ycp 32011 2006-07-26 15:05:52Z locilka $
+ * $Id: dialogs.ycp 32634 2006-08-30 13:35:02Z locilka $
*/
{
@@ -19,7 +19,7 @@
import "Wizard";
import "Message";
import "SuSEFirewall";
- import "DnsServerPunycode";
+ import "Punycode";
/**
* Ask user if exit without saving
@@ -316,7 +316,7 @@
define symbol runZoneTypeSwitch () ``{
string type = current_zone["type"]:"master";
string name = current_zone["zone"]:"unknown";
- y2milestone ("Editing zone %1 (%2), type %3", name, DnsServerPunycode::DecodeDomainName(name), type);
+ y2milestone ("Editing zone %1 (%2), type %3", name, Punycode::DecodeDomainName(name), type);
if (type == "master")
return `master;
else if (type == "slave")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org