summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/f_host.py
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2009-01-21 12:42:40 -0700
committerJason Gerard DeRose <jderose@redhat.com>2009-01-21 12:42:40 -0700
commit5616af19b137e22013b040f0480bfef37e7ad23f (patch)
tree149f83049cc189755ade4d708e4a0eeba8a8165d /ipalib/plugins/f_host.py
parentf22f3eabb20e6c46f78ba5c40d75bb52b7872060 (diff)
parentaba16941ee6826b0d65d11e73efb8a62f4a35da1 (diff)
downloadfreeipa.git-5616af19b137e22013b040f0480bfef37e7ad23f.tar.gz
freeipa.git-5616af19b137e22013b040f0480bfef37e7ad23f.tar.xz
freeipa.git-5616af19b137e22013b040f0480bfef37e7ad23f.zip
Merge branch 'master' of git://git.engineering.redhat.com/users/rcritten/freeipa2
Diffstat (limited to 'ipalib/plugins/f_host.py')
-rw-r--r--ipalib/plugins/f_host.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/plugins/f_host.py b/ipalib/plugins/f_host.py
index 3fcda77c..ea819a77 100644
--- a/ipalib/plugins/f_host.py
+++ b/ipalib/plugins/f_host.py
@@ -21,7 +21,7 @@
Frontend plugins for host/machine Identity.
"""
-from ipalib import api, crud, errors
+from ipalib import api, crud, errors, util
from ipalib import Object # Plugin base class
from ipalib import Str, Flag # Parameter types
@@ -42,7 +42,7 @@ def get_host(hostname):
dn = ldap.find_entry_dn("serverhostname", hostname, "ipaHost")
return dn
-def validate_host(cn):
+def validate_host(ugettext, cn):
"""
Require at least one dot in the hostname (to support localhost.localdomain)
"""
@@ -129,7 +129,7 @@ class host_add(crud.Add):
# some required objectclasses
# FIXME: add this attribute to cn=ipaconfig
#kw['objectclass'] = config.get('ipahostobjectclasses')
- kw['objectclass'] = ['nsHost', 'ipaHost']
+ kw['objectclass'] = ['nsHost', 'ipaHost', 'pkiUser']
# Ensure the list of objectclasses is lower-case
kw['objectclass'] = map(lambda z: z.lower(), kw.get('objectclass'))