Author: locilka Date: Fri Jan 7 14:51:43 2011 New Revision: 63132 URL: http://svn.opensuse.org/viewcvs/yast?rev=63132&view=rev Log: Allowing wildcard '*' for some resource records (BNC #646895) Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/dialog-masterzone.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-server.changes?rev=63132&r1=63131&r2=63132&view=diff ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Jan 7 14:51:43 2011 @@ -2,6 +2,7 @@ Fri Jan 7 10:31:22 CET 2011 - locilka@suse.cz - Fixed help text (BNC #620101) +- Allowing wildcard '*' for some resource records (BNC #646895). ------------------------------------------------------------------ Thu Jan 6 14:17:25 CET 2011 - locilka@suse.cz Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone.ycp?rev=63132&r1=63131&r2=63132&view=diff ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Fri Jan 7 14:51:43 2011 @@ -1350,7 +1350,8 @@ // -- A -- \\ if (type == "A") { // (hostname or FQ -> IPv4) - if (Hostname::Check(key) != true && Hostname::CheckFQ(key) != true) { + // BNC #646895: Wildcard '*' not supported as valid hostname + if (Hostname::Check(key) != true && Hostname::CheckFQ(key) != true && key != "*") { UI::SetFocus ( `id ("add_record_name") ); Popup::Error ( Hostname::ValidFQ() ); return false; @@ -1365,7 +1366,7 @@ // -- CNAME -- \\ } else if (type == "CNAME") { // (hostname or FQ -> hostname or FQ) - if (Hostname::Check(key) != true && Hostname::CheckFQ(key) != true) { + if (Hostname::Check(key) != true && Hostname::CheckFQ(key) != true && key != "*") { UI::SetFocus ( `id ("add_record_name") ); Popup::Error ( Hostname::ValidFQ() ); return false; @@ -1382,7 +1383,8 @@ // (hostname or domain or FQ -> hostname or FQ) if (Hostname::Check(key) != true && Hostname::CheckDomain(key) != true && - Hostname::CheckFQ(key) != true + Hostname::CheckFQ(key) != true && + key != "*" ) { UI::SetFocus ( `id ("add_record_name") ); Popup::Error ( Hostname::ValidFQ() ); @@ -1404,7 +1406,8 @@ // (hostname or domain or FQ -> hostname or FQ) if (Hostname::Check(key) != true && Hostname::CheckDomain(key) != true && - Hostname::CheckFQ(key) != true + Hostname::CheckFQ(key) != true && + key != "*" ) { UI::SetFocus ( `id ("add_record_name") ); Popup::Error ( Hostname::ValidFQ() ); @@ -1464,7 +1467,7 @@ // -- AAAA -- \\ } else if (type == "AAAA") { // (hostname or FQ) - if (Hostname::Check(key) != true && Hostname::CheckFQ(key) != true) { + if (Hostname::Check(key) != true && Hostname::CheckFQ(key) != true && key != "*") { UI::SetFocus ( `id ("add_record_name") ); Popup::Error ( Hostname::ValidFQ() ); return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org