From a2714b0b1f0cd1df63a27aec0d7a6639e58c06a6 Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Thu, 15 Aug 2019 20:32:45 +0200
Subject: [PATCH] Do not update multiple challenges

Do not update if data does not match.
---
 certbot_dns_ispconfig/dns_ispconfig.py | 8 ++++----
 setup.py                               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/certbot_dns_ispconfig/dns_ispconfig.py b/certbot_dns_ispconfig/dns_ispconfig.py
index 5eb4596..528139b 100644
--- a/certbot_dns_ispconfig/dns_ispconfig.py
+++ b/certbot_dns_ispconfig/dns_ispconfig.py
@@ -125,7 +125,7 @@ class _ISPConfigClient(object):
         o_record_name = record_name
         record_name = record_name.replace(zone_name, '')[:-1]
         logger.debug('using record_name: %s from original: %s', record_name, o_record_name)
-        record = self.get_existing_txt(zone_id, record_name)
+        record = self.get_existing_txt(zone_id, record_name, record_content)
         if record is not None:
             if record['data'] == record_content:
                 logger.info('already there, id {0}'.format(record['id']))
@@ -155,7 +155,7 @@ class _ISPConfigClient(object):
         o_record_name = record_name
         record_name = record_name.replace(zone_name, '')[:-1]
         logger.debug('using record_name: %s from original: %s', record_name, o_record_name)
-        record = self.get_existing_txt(zone_id, record_name)
+        record = self.get_existing_txt(zone_id, record_name, record_content)
         if record is not None:
             if record['data'] == record_content:
                 logger.debug('delete TXT record: %s', record['id'])
@@ -217,7 +217,7 @@ class _ISPConfigClient(object):
                 pass
         return None
 
-    def get_existing_txt(self, zone_id, record_name):
+    def get_existing_txt(self, zone_id, record_name, record_content):
         """
         Get existing TXT records from the RRset for the record name.
 
@@ -235,6 +235,6 @@ class _ISPConfigClient(object):
         read_zone_data = {'zone_id': zone_id}
         zone_data = self._api_request('dns_rr_get_all_by_zone', read_zone_data)
         for entry in zone_data:
-            if entry['name'] == record_name and entry['type'] == 'TXT':
+            if entry['name'] == record_name and entry['type'] == 'TXT' and entry['data'] == record_content:
                 return entry
         return None
diff --git a/setup.py b/setup.py
index 4915e38..8b229ea 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 from setuptools import find_packages
 
-version = '0.1.7'
+version = '0.1.8'
 
 # Remember to update local-oldest-requirements.txt when changing the minimum
 # acme/certbot version.