From 4a9319a2a90861101d6775498d194d14cfc20cf6 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Thu, 25 Aug 2011 09:24:47 -0400
Subject: Retrieve password/keytab state when modifying a host.

ticket https://fedorahosted.org/freeipa/ticket/1714
---
 ipalib/plugins/host.py                | 5 +++++
 tests/test_xmlrpc/test_host_plugin.py | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index 6e9efec1a..6c590ca4f 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -667,6 +667,11 @@ class host_mod(LDAPUpdate):
         if options.get('random', False):
             entry_attrs['randompassword'] = unicode(getattr(context, 'randompassword'))
         set_certificate_attrs(entry_attrs)
+        self.obj.get_password_attributes(ldap, dn, entry_attrs)
+        if entry_attrs['has_password']:
+            # If an OTP is set there is no keytab, at least not one
+            # fetched anywhere.
+            entry_attrs['has_keytab'] = False
 
         if options.get('all', False):
             entry_attrs['managing'] = self.obj.get_managed_hosts(dn)
diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py
index f7746407b..5e7137060 100644
--- a/tests/test_xmlrpc/test_host_plugin.py
+++ b/tests/test_xmlrpc/test_host_plugin.py
@@ -255,6 +255,8 @@ class test_host(Declarative):
                     md5_fingerprint=fuzzy_hash,
                     sha1_fingerprint=fuzzy_hash,
                     issuer=fuzzy_issuer,
+                    has_keytab=False,
+                    has_password=False,
                 ),
             ),
         ),
-- 
cgit