Patch attached.

Services must be removed before records are updated


From 7c0d3bd3ff3f507ddcd92d7b2f8e2363696c4dba Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Mon, 20 Jun 2016 19:27:55 +0200
Subject: [PATCH] Server-del: fix system records removal

Services on replica to be removed  must be deleted first, otherwise
update of system records will not take this change into account

https://fedorahosted.org/freeipa/ticket/2008
---
 ipaserver/plugins/server.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py
index 42bcb393f21ca802c2a98a3674f9649e6ede446f..ad325130976bef1e0a1486ed73fc5a6a23879ebe 100644
--- a/ipaserver/plugins/server.py
+++ b/ipaserver/plugins/server.py
@@ -676,12 +676,12 @@ class server_del(LDAPDelete):
         # remove the references to master's ldap/http principals
         self._remove_server_principal_references(pkey)
 
-        # try to clean up the leftover DNS entries
-        self._cleanup_server_dns_records(pkey)
-
         # finally destroy all Kerberos principals
         self._remove_server_host_services(ldap, pkey)
 
+        # try to clean up the leftover DNS entries
+        self._cleanup_server_dns_records(pkey)
+
         return dn
 
     def exc_callback(self, keys, options, exc, call_func, *call_args,
-- 
2.5.5

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to