zrhoffman / rpms / 389-ds-base

Forked from rpms/389-ds-base 3 years ago
Clone

Blame SOURCES/0016-Ticket-50028-ds-replcheck-y-option-throws-usage-erro.patch

26521d
From 24ffb21ba81fcd1272aa3232c5f17cee6c7568ef Mon Sep 17 00:00:00 2001
26521d
From: Mark Reynolds <mreynolds@redhat.com>
26521d
Date: Thu, 4 Apr 2019 12:43:13 -0400
26521d
Subject: [PATCH] Ticket 50028 - ds-replcheck -y option throws usage error
26521d
26521d
Description:  Using the password file option (-y) causes
26521d
              a usage error to occur.  The arg validation
26521d
              needs to properly check for this option.
26521d
26521d
https://pagure.io/389-ds-base/issue/50028
26521d
26521d
Reviewed by: mreynolds(one line commit rule)
26521d
---
26521d
 ldap/admin/src/scripts/ds-replcheck | 2 +-
26521d
 1 file changed, 1 insertion(+), 1 deletion(-)
26521d
26521d
diff --git a/ldap/admin/src/scripts/ds-replcheck b/ldap/admin/src/scripts/ds-replcheck
26521d
index f48240699..e18465dc0 100755
26521d
--- a/ldap/admin/src/scripts/ds-replcheck
26521d
+++ b/ldap/admin/src/scripts/ds-replcheck
26521d
@@ -1209,7 +1209,7 @@ def main():
26521d
     elif (args.mldif is None and
26521d
           (args.suffix is None or
26521d
            args.binddn is None or
26521d
-           (args.bindpw is None and args.prompt is False) or
26521d
+           (args.bindpw is None and (args.prompt is False and args.pass_file is None)) or
26521d
            args.murl is None or
26521d
            args.rurl is None)):
26521d
             print("\n-------> Missing required options for online mode!\n")
26521d
-- 
26521d
2.17.2
26521d