diff options
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/plugins/join.py | 3 | ||||
| -rw-r--r-- | ipaserver/rpcserver.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ipaserver/plugins/join.py b/ipaserver/plugins/join.py index e2f72bfaf..74fa806ff 100644 --- a/ipaserver/plugins/join.py +++ b/ipaserver/plugins/join.py @@ -113,6 +113,9 @@ class join(Command): attrs_list = api.Command['host_add'](hostname)['result'] dn = attrs_list['dn'] + config = api.Command['config_show']()['result'] + attrs_list['ipacertificatesubjectbase'] = config['ipacertificatesubjectbase'] + return (dn, attrs_list) api.register(join) diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 795a240d9..71d55445b 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -295,7 +295,8 @@ class xmlserver(WSGIExecutioner): self.info('response: %s: %s', error.__class__.__name__, str(error)) response = Fault(error.errno, error.strerror) else: - self.info('response: entries returned %d', result.get('count', 1)) + if isinstance(result, dict): + self.info('response: entries returned %d', result.get('count', 1)) response = (result,) return xml_dumps(response, methodresponse=True) |