71 lines
3.2 KiB
Diff
71 lines
3.2 KiB
Diff
From 09a284ee43c2b4346da892f8756f97accd15ca68 Mon Sep 17 00:00:00 2001
|
|
From: Simon Pichugin <spichugi@redhat.com>
|
|
Date: Wed, 4 Dec 2024 21:59:40 -0500
|
|
Subject: [PATCH] Issue 6302 - Allow to run replication status without a prompt
|
|
(#6410)
|
|
|
|
Description: We should allow running replication status and
|
|
other similar commands without requesting a password and bind DN.
|
|
|
|
This way, the current instance's root DN and root PW will be used on other
|
|
instances when requesting CSN info. If they are incorrect,
|
|
then the info won't be printed, but otherwise, the agreement status
|
|
will be displayed correctly.
|
|
|
|
Fixes: https://github.com/389ds/389-ds-base/issues/6302
|
|
|
|
Reviewed by: @progier389 (Thanks!)
|
|
---
|
|
src/lib389/lib389/cli_conf/replication.py | 15 +++------------
|
|
1 file changed, 3 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/lib389/lib389/cli_conf/replication.py b/src/lib389/lib389/cli_conf/replication.py
|
|
index 399d0d2f8..cd4a331a8 100644
|
|
--- a/src/lib389/lib389/cli_conf/replication.py
|
|
+++ b/src/lib389/lib389/cli_conf/replication.py
|
|
@@ -319,12 +319,9 @@ def list_suffixes(inst, basedn, log, args):
|
|
def get_repl_status(inst, basedn, log, args):
|
|
replicas = Replicas(inst)
|
|
replica = replicas.get(args.suffix)
|
|
- pw_and_dn_prompt = False
|
|
if args.bind_passwd_file is not None:
|
|
args.bind_passwd = get_passwd_from_file(args.bind_passwd_file)
|
|
- if args.bind_passwd_prompt or args.bind_dn is None or args.bind_passwd is None:
|
|
- pw_and_dn_prompt = True
|
|
- status = replica.status(binddn=args.bind_dn, bindpw=args.bind_passwd, pwprompt=pw_and_dn_prompt)
|
|
+ status = replica.status(binddn=args.bind_dn, bindpw=args.bind_passwd, pwprompt=args.bind_passwd_prompt)
|
|
if args.json:
|
|
log.info(json.dumps({"type": "list", "items": status}, indent=4))
|
|
else:
|
|
@@ -335,12 +332,9 @@ def get_repl_status(inst, basedn, log, args):
|
|
def get_repl_winsync_status(inst, basedn, log, args):
|
|
replicas = Replicas(inst)
|
|
replica = replicas.get(args.suffix)
|
|
- pw_and_dn_prompt = False
|
|
if args.bind_passwd_file is not None:
|
|
args.bind_passwd = get_passwd_from_file(args.bind_passwd_file)
|
|
- if args.bind_passwd_prompt or args.bind_dn is None or args.bind_passwd is None:
|
|
- pw_and_dn_prompt = True
|
|
- status = replica.status(binddn=args.bind_dn, bindpw=args.bind_passwd, winsync=True, pwprompt=pw_and_dn_prompt)
|
|
+ status = replica.status(binddn=args.bind_dn, bindpw=args.bind_passwd, winsync=True, pwprompt=args.bind_passwd_prompt)
|
|
if args.json:
|
|
log.info(json.dumps({"type": "list", "items": status}, indent=4))
|
|
else:
|
|
@@ -874,12 +868,9 @@ def poke_agmt(inst, basedn, log, args):
|
|
|
|
def get_agmt_status(inst, basedn, log, args):
|
|
agmt = get_agmt(inst, args)
|
|
- pw_and_dn_prompt = False
|
|
if args.bind_passwd_file is not None:
|
|
args.bind_passwd = get_passwd_from_file(args.bind_passwd_file)
|
|
- if args.bind_passwd_prompt or args.bind_dn is None or args.bind_passwd is None:
|
|
- pw_and_dn_prompt = True
|
|
- status = agmt.status(use_json=args.json, binddn=args.bind_dn, bindpw=args.bind_passwd, pwprompt=pw_and_dn_prompt)
|
|
+ status = agmt.status(use_json=args.json, binddn=args.bind_dn, bindpw=args.bind_passwd, pwprompt=args.bind_passwd_prompt)
|
|
log.info(status)
|
|
|
|
|
|
--
|
|
2.49.0
|
|
|