diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py index 94ada8b9d..cb200ba68 100644 --- a/ipaserver/plugins/server.py +++ b/ipaserver/plugins/server.py @@ -659,10 +659,26 @@ class server_del(LDAPDelete): delete server kerberos key and all its svc principals """ try: + # do not delete ldap principal if server-del command + # has been called on a machine which is being deleted + # since this will break replication. + # ldap principal to be cleaned later by topology plugin + # necessary changes to a topology plugin are tracked + # under https://pagure.io/freeipa/issue/7359 + if master == self.api.env.host: + filter = ( + '(&(krbprincipalname=*/{}@{})' + '(!(krbprincipalname=ldap/*)))' + .format(master, self.api.env.realm) + ) + else: + filter = '(krbprincipalname=*/{}@{})'.format( + master, self.api.env.realm + ) + entries = ldap.get_entries( - self.api.env.basedn, ldap.SCOPE_SUBTREE, - filter='(krbprincipalname=*/{}@{})'.format( - master, self.api.env.realm)) + self.api.env.basedn, ldap.SCOPE_SUBTREE, filter=filter + ) if entries: entries.sort(key=lambda x: len(x.dn), reverse=True)