From 07df7bb4e62dd2f03fe2c16b1d7bd605191ed8fc Mon Sep 17 00:00:00 2001 From: Anderson Toshiyuki Sasaki Date: Fri, 25 Oct 2019 13:55:04 +0200 Subject: [PATCH] tests: Do not parse global config in torture_ssh_session() Do not parse global config file in sessions created by torture_ssh_session(). Signed-off-by: Anderson Toshiyuki Sasaki Reviewed-by: Andreas Schneider Reviewed-by: Jakub Jelen (cherry picked from commit 8a50dbc6ba33cf1f2596a07927eec309edf809b3) --- tests/torture.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/torture.c b/tests/torture.c index 772942c2..eeeeafee 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -262,6 +262,8 @@ ssh_session torture_ssh_session(struct torture_state *s, int method; int rc; + bool process_config = false; + if (host == NULL) { return NULL; } @@ -277,6 +279,10 @@ ssh_session torture_ssh_session(struct torture_state *s, } #endif /* WITH_PCAP */ + if (ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity) < 0) { + goto failed; + } + if (ssh_options_set(session, SSH_OPTIONS_HOST, host) < 0) { goto failed; } @@ -293,7 +299,8 @@ ssh_session torture_ssh_session(struct torture_state *s, } } - if (ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity) < 0) { + if (ssh_options_set(session, SSH_OPTIONS_PROCESS_CONFIG, + &process_config) < 0) { goto failed; }