[389-commits] [389-ds-base] branch 389-ds-base-1.4.1 updated: Issue 50872 - dsconf can't create GSSAPI replication agreements

This is an automated email from the git hooks/post-receive script.

mreynolds pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.

The following commit(s) were added to refs/heads/389-ds-base-1.4.1 by this push:
new 265d4df Issue 50872 - dsconf can't create GSSAPI replication agreements
265d4df is described below

commit 265d4df730fbcd71a2bbe5de528ff461ba541c00
Author: Mark Reynolds <mreynolds@redhat.com>
AuthorDate: Thu Feb 27 15:01:40 2020 -0500

Issue 50872 - dsconf can't create GSSAPI replication agreements

Description: An error in python syntax broke the check for bind
method vs credentials.

Bug was found and fixed by: quentinmit (Thanks!)

relates: https://pagure.io/389-ds-base/issue/50872

Reviewed by: mreynolds

(cherry picked from commit 75a51aa395018d75b7feca38101cc89fa4627e1c)
---
src/lib389/lib389/cli_conf/replication.py | 2 +-
src/lib389/lib389/replica.py | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib389/lib389/cli_conf/replication.py b/src/lib389/lib389/cli_conf/replication.py
index 1c0c925..8e77c36 100644
--- a/src/lib389/lib389/cli_conf/replication.py
+++ b/src/lib389/lib389/cli_conf/replication.py
@@ -663,7 +663,7 @@ def add_agmt(inst, basedn, log, args):
properties['nsds5replicastripattrs'] = args.strip_list

# We do need the bind dn and credentials for none-sasl bind methods
- if (bind_method == 'simple' or 'sslclientauth') and (args.bind_dn is None or args.bind_passwd is None):
+ if (bind_method in ('simple', 'sslclientauth')) and (args.bind_dn is None or args.bind_passwd is None):
raise ValueError("You need to set the bind dn (--bind-dn) and the password (--bind-passwd) for bind method ({})".format(bind_method))

# Create the agmt
diff --git a/src/lib389/lib389/replica.py b/src/lib389/lib389/replica.py
index 0fc1275..e3fc7fe 100644
--- a/src/lib389/lib389/replica.py
+++ b/src/lib389/lib389/replica.py
@@ -16,7 +16,6 @@ import logging
import uuid
import json
import copy
-from shutil import copyfile
from operator import itemgetter
from itertools import permutations
from lib389._constants import *

--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/389-commits@lists.fedoraproject.org