Author: locilka
Date: Thu Jan 6 14:35:10 2011
New Revision: 63111
URL: http://svn.opensuse.org/viewcvs/yast?rev=63111&view=rev
Log:
Implemented less strict TXT record check (BNC #620480).
Modified:
branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION
branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes
branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION?rev=63111&r1=63110&r2=63111&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION Thu Jan 6 14:35:10 2011
@@ -1 +1 @@
-2.17.12
+2.17.13
Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes?rev=63111&r1=63110&r2=63111&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Thu Jan 6 14:35:10 2011
@@ -1,3 +1,9 @@
+------------------------------------------------------------------
+Thu Jan 6 14:17:25 CET 2011 - locilka@suse.cz
+
+- Implemented less strict TXT record check (BNC #620480).
+- 2.17.13
+
-------------------------------------------------------------------
Thu Nov 26 14:00:19 CET 2009 - locilka@suse.cz
Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp?rev=63111&r1=63110&r2=63111&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Thu Jan 6 14:35:10 2011
@@ -1308,6 +1308,31 @@
}
/**
+ * Checks whether a given string is a valid TXT record key (name)
+ */
+boolean ValidTXTRecordName (string name) {
+ // Checking the length
+ if (name == nil || name == "") {
+ y2warning ("TXT record key must not be empty");
+ return false;
+ }
+
+ // Checking for forbidden '='
+ if (regexpmatch(name, "=")) {
+ y2warning ("TXT record key %1 must not contain a '=' character.", name);
+ return false;
+ }
+
+ // only US-ASCII characters are allowed
+ if (size(name) != size(toascii(name))) {
+ y2warning ("TXT record key %1 contains some non US-ASCII characters", name);
+ return false;
+ }
+
+ return true;
+}
+
+/**
* Checking new record by the "type"
*/
boolean CheckNewZoneRecordSyntax (map