URL: https://github.com/freeipa/freeipa/pull/960 Author: davidkupka Title: #960: tests: Add LDAP URI to ldappasswd explicitelly Action: opened
PR body: """ https://fedorahosted.org/freeipa/ticket/6622 This PR replaces PR #404 which is orphaned and I'm no longer able to push into it. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/960/head:pr960 git checkout pr960
From 052a248329e6b08051149c70fb414f490b1e27bd Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Thu, 19 Jan 2017 09:18:32 +0100 Subject: [PATCH] tests: Add LDAP URI to ldappasswd explicitelly https://fedorahosted.org/freeipa/ticket/6622 --- ipatests/pytest_plugins/integration/tasks.py | 3 ++- ipatests/util.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ipatests/pytest_plugins/integration/tasks.py b/ipatests/pytest_plugins/integration/tasks.py index 9341c2910f..4cd993520b 100644 --- a/ipatests/pytest_plugins/integration/tasks.py +++ b/ipatests/pytest_plugins/integration/tasks.py @@ -1314,7 +1314,8 @@ def ldappasswd_user_change(user, oldpw, newpw, master): basedn = master.domain.basedn userdn = "uid={},{},{}".format(user, container_user, basedn) + master_ldap_uri = "ldap://{}:389".format(master.external_hostname) args = [paths.LDAPPASSWD, '-D', userdn, '-w', oldpw, '-a', oldpw, - '-s', newpw, '-x'] + '-s', newpw, '-x', '-H', master_ldap_uri] master.run_command(args) diff --git a/ipatests/util.py b/ipatests/util.py index 575d5cc36b..3727490bac 100644 --- a/ipatests/util.py +++ b/ipatests/util.py @@ -748,7 +748,7 @@ def unlock_principal_password(user, oldpw, newpw): user, api.env.container_user, api.env.basedn) args = [paths.LDAPPASSWD, '-D', userdn, '-w', oldpw, '-a', oldpw, - '-s', newpw, '-x'] + '-s', newpw, '-x', '-H', api.env.ldap_uri] return run(args)
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
