URL: https://github.com/freeipa/freeipa/pull/555 Author: martbab Title: #555: ipa-managed-entries: use server-mode API Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/555/head:pr555 git checkout pr555
From e898abfec45119a3bc980500fae1b513326e9718 Mon Sep 17 00:00:00 2001 From: Martin Babinsky <mbabi...@redhat.com> Date: Wed, 8 Mar 2017 12:16:31 +0100 Subject: [PATCH 1/2] ipa-managed-entries: use server-mode API During LDAP connection management refactoring the ad-hoc ldap connection in `ipa-managed-entries` was replaced by calls to ldap2 backend without updating API initialization. https://pagure.io/freeipa/issue/6735 --- install/tools/ipa-managed-entries | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index efcf3ec..d50faf7 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -73,7 +73,11 @@ def main(): sys.exit("Unrecognized action [" + args[0] + "]") standard_logging_setup(None, debug=options.debug) - api.bootstrap(context='cli', debug=options.debug, confdir=paths.ETC_IPA) + api.bootstrap( + context='cli', + in_server=True, + debug=options.debug, + confdir=paths.ETC_IPA) api.finalize() api.Backend.ldap2.connect(bind_pw=options.dirman_password) From 93dc9584ab35bf08851fb316e0f6d01f64bb7f4f Mon Sep 17 00:00:00 2001 From: Martin Babinsky <mbabi...@redhat.com> Date: Wed, 8 Mar 2017 16:45:08 +0100 Subject: [PATCH 2/2] ipa-managed-entries: only permit running the command on IPA master https://pagure.io/freeipa/issue/6735 --- install/tools/ipa-managed-entries | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index d50faf7..731dcc3 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -63,6 +63,9 @@ def get_dirman_password(): def main(): retval = 0 def_dn = None + + installutils.check_server_configuration() + options, args = parse_options() if options.list_managed_entries:
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
