diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-05-25 12:31:03 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-06-03 09:00:34 +0200 |
| commit | 56c66f44a0e356504bf8a7edcc924777adc1b352 (patch) | |
| tree | 116e503a2b25826f21ed6a10f131da96f6fedcd2 /install/tools | |
| parent | e056b8dea208ccde8e06b199809ce038ccd0531e (diff) | |
| download | freeipa-56c66f44a0e356504bf8a7edcc924777adc1b352.tar.gz freeipa-56c66f44a0e356504bf8a7edcc924777adc1b352.tar.xz freeipa-56c66f44a0e356504bf8a7edcc924777adc1b352.zip | |
rpc: specify connection options in API config
Specify RPC connection options once in API.bootstrap rather than in each
invocation of rpcclient.connect.
https://fedorahosted.org/freeipa/ticket/4739
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-replica-conncheck | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index d88291e55..fdf08d631 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -453,8 +453,6 @@ def main(): xmlrpc_uri = ('https://%s/ipa/xml' % ipautil.format_netloc(options.master)) - api.bootstrap(context='client', xmlrpc_uri=xmlrpc_uri) - api.finalize() if options.ca_cert_file: nss_dir = None @@ -462,6 +460,10 @@ def main(): nss_dir = paths.IPA_NSSDB_DIR with certdb.NSSDatabase(nss_dir) as nss_db: + api.bootstrap(context='client', xmlrpc_uri=xmlrpc_uri, + nss_dir=nss_db.secdir) + api.finalize() + if options.ca_cert_file: nss_dir = nss_db.secdir @@ -480,7 +482,7 @@ def main(): nss_dir = None try: - api.Backend.rpcclient.connect(nss_dir=nss_dir) + api.Backend.rpcclient.connect() api.Command.ping() except Exception as e: print_info( |