pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone

Blame SOURCES/0103-DNSSEC-remove-DNSSEC-is-experimental-warnings.patch

590d18
From 36d0ae5682bd4e71ba3c27900f4699c07aa27f68 Mon Sep 17 00:00:00 2001
590d18
From: Martin Basti <mbasti@redhat.com>
590d18
Date: Mon, 31 Aug 2015 13:51:02 +0200
590d18
Subject: [PATCH] DNSSEC: remove "DNSSEC is experimental" warnings
590d18
590d18
https://fedorahosted.org/freeipa/ticket/5265
590d18
590d18
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
590d18
---
590d18
 ipalib/plugins/dns.py    | 18 ------------------
590d18
 ipaserver/install/dns.py |  2 --
590d18
 2 files changed, 20 deletions(-)
590d18
590d18
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
590d18
index 512a653c3cc8ee641debec0d20f58e17eff08266..a3d562edb186682a872073e6c83a416b6a4cbc09 100644
590d18
--- a/ipalib/plugins/dns.py
590d18
+++ b/ipalib/plugins/dns.py
590d18
@@ -2624,22 +2624,6 @@ class dnszone(DNSZoneBase):
590d18
             messages.add_message(options.get('version', VERSION_WITHOUT_CAPABILITIES),
590d18
                                  result, messages.ForwardersWarning())
590d18
 
590d18
-    def _warning_dnssec_experimental(self, result, *keys, **options):
590d18
-        # add warning when user use option --dnssec
590d18
-        if 'idnssecinlinesigning' in options:
590d18
-            if options['idnssecinlinesigning'] is True:
590d18
-                messages.add_message(options['version'], result,
590d18
-                    messages.DNSSECWarning(
590d18
-                    additional_info=_("Visit 'http://www.freeipa.org/page/Releases/4.1.0#DNSSEC_Support'.")
590d18
-                ))
590d18
-            else:
590d18
-                messages.add_message(options['version'], result,
590d18
-                    messages.DNSSECWarning(
590d18
-                    additional_info=_("If you encounter any problems please "
590d18
-                    "report them and restart 'named' service on affected IPA "
590d18
-                    "server.")
590d18
-                ))
590d18
-
590d18
     def _warning_name_server_option(self, result, context, **options):
590d18
         if getattr(context, 'show_warning_nameserver_option', False):
590d18
             messages.add_message(
590d18
@@ -2735,7 +2719,6 @@ class dnszone_add(DNSZoneBase_add):
590d18
         result = super(dnszone_add, self).execute(*keys, **options)
590d18
         self._warning_deprecated_option(result, **options)
590d18
         self.obj._warning_forwarding(result, **options)
590d18
-        self.obj._warning_dnssec_experimental(result, *keys, **options)
590d18
         self.obj._warning_name_server_option(result, context, **options)
590d18
         self.obj._warning_fw_zone_is_not_effective(result, *keys, **options)
590d18
         return result
590d18
@@ -2826,7 +2809,6 @@ class dnszone_mod(DNSZoneBase_mod):
590d18
     def execute(self, *keys, **options):
590d18
         result = super(dnszone_mod, self).execute(*keys, **options)
590d18
         self.obj._warning_forwarding(result, **options)
590d18
-        self.obj._warning_dnssec_experimental(result, *keys, **options)
590d18
         self.obj._warning_name_server_option(result, context, **options)
590d18
         return result
590d18
 
590d18
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
590d18
index 9430d189978b0984b0b71d7d754516a4135053fb..538e99fbe01a34cee627f1cebd938be19777c134 100644
590d18
--- a/ipaserver/install/dns.py
590d18
+++ b/ipaserver/install/dns.py
590d18
@@ -126,8 +126,6 @@ def install_check(standalone, replica, options, hostname):
590d18
         print "NOTE: DNSSEC zone signing is not enabled by default"
590d18
         print ""
590d18
         if options.dnssec_master:
590d18
-            print "DNSSEC support is experimental!"
590d18
-            print ""
590d18
             print "Plan carefully, replacing DNSSEC key master is not recommended"
590d18
             print ""
590d18
         print ""
590d18
-- 
590d18
2.5.1
590d18