From d2538a0777b3dd6e8253108ac00158fce8d64315 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 19 Jun 2024 16:26:29 +0200
Subject: [PATCH] rec: make names of new udr settings consistent with existing
 scheme

---
 pdns/recursordist/rec-main.cc       |  6 ++--
 pdns/recursordist/settings/table.py | 54 ++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 57004038e9..e8a9c29c16 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -906,9 +906,9 @@ static void setupNODGlobal()
   g_udrLog = ::arg().mustDo("unique-response-log");
   g_nod_pbtag = ::arg()["new-domain-pb-tag"];
   g_udr_pbtag = ::arg()["unique-response-pb-tag"];
-  parseIgnorelist(::arg()["udr-ignore-list"], g_udrDomainWL);
-  if (!::arg().isEmpty("udr-ignore-list-file")) {
-    parseIgnorelistFile(::arg()["udr-ignore-list-file"], g_udrDomainWL);
+  parseIgnorelist(::arg()["unique-response-ignore-list"], g_udrDomainWL);
+  if (!::arg().isEmpty("unique-response-ignore-list-file")) {
+    parseIgnorelistFile(::arg()["unique-response-ignore-list-file"], g_udrDomainWL);
   }
 }
 #endif /* NOD_ENABLED */
diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py
index e029d9c072..9255c98ff9 100644
--- a/pdns/recursordist/settings/table.py
+++ b/pdns/recursordist/settings/table.py
@@ -1817,33 +1817,6 @@ feature.
 Path to a file with a list of domains. File should have one domain per line,
 with no extra characters or comments.
 See :ref:`setting-new-domain-ignore-list`.
- ''',
-    'versionadded': '5.1.0'
-    },
-    {
-        'name' : 'udr_ignore_list',
-        'section' : 'nod',
-        'type' : LType.ListStrings,
-        'default' : '',
-        'help' : 'List of domains (and implicitly all subdomains) which will never be considered for UDR',
-        'doc' : '''
-This setting is a list of all domains (and implicitly all subdomains)
-that will never be considered for a new unique domain request.
-For example, if the domain 'example.com' is in the list, then 'foo.bar.example.com'
-will never be considered for a new unique domain request.
- ''',
-    'versionadded': '5.1.0'
-    },
-    {
-        'name' : 'udr_ignore_list_file',
-        'section' : 'nod',
-        'type' : LType.String,
-        'default' : '',
-        'help' : 'File with list of domains (and implicitly all subdomains) which will never be considered for UDR',
-        'doc' : '''
-Path to a file with a list of domains. File should have one domain per line,
-with no extra characters or comments.
-See :ref:`setting-udr-ignore-list`.
  ''',
     'versionadded': '5.1.0'
     },
@@ -3040,6 +3013,33 @@ a unique DNS response is observed.
  ''',
     'versionadded': '4.2.0'
     },
+    {
+        'name' : 'unique_response_ignore_list',
+        'section' : 'nod',
+        'type' : LType.ListStrings,
+        'default' : '',
+        'help' : 'List of domains (and implicitly all subdomains) which will never be considered for UDR',
+        'doc' : '''
+This setting is a list of all domains (and implicitly all subdomains)
+that will never be considered for a new unique domain request.
+For example, if the domain 'example.com' is in the list, then 'foo.bar.example.com'
+will never be considered for a new unique domain request.
+''',
+        'versionadded': '5.1.0'
+    },
+    {
+        'name' : 'unique_response_ignore_list_file',
+        'section' : 'nod',
+        'type' : LType.String,
+        'default' : '',
+        'help' : 'File with list of domains (and implicitly all subdomains) which will never be considered for UDR',
+        'doc' : '''
+Path to a file with a list of domains. File should have one domain per line,
+with no extra characters or comments.
+See :ref:`setting-unique-response-ignore-list`.
+''',
+        'versionadded': '5.1.0'
+    },
     {
         'name' : 'use_incoming_edns_subnet',
         'section' : 'incoming',
-- 
2.47.2