From 5a99cf9c7fd79adfbc5ac693e7e7444a85cad219 Mon Sep 17 00:00:00 2001 From: Gauravsingh Sisodia Date: Thu, 7 Aug 2025 12:53:04 +0000 Subject: [PATCH] refactor: remove extra else if branch for disable_hostkeys Signed-off-by: Gauravsingh Sisodia Reviewed-by: Jakub Jelen Reviewed-by: Andreas Schneider --- tests/torture.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/tests/torture.c b/tests/torture.c index 30521947..436a4aaf 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -1008,35 +1008,15 @@ torture_setup_create_sshd_config(void **state, bool pam, bool second_sshd) usepam, additional_config, second_sshd ? s->srv1_pidfile : s->srv_pidfile); - } else if (s->disable_hostkeys) { - snprintf(sshd_config, - sizeof(sshd_config), - config_string, - second_sshd ? TORTURE_SSHD_SRV1_IPV4 : TORTURE_SSHD_SRV_IPV4, - second_sshd ? TORTURE_SSHD_SRV1_IPV6 : TORTURE_SSHD_SRV_IPV6, - "", - "", - "", - "", - "", - "", - trusted_ca_pubkey, - sftp_server, - usepam, - additional_config, - second_sshd ? s->srv1_pidfile : s->srv_pidfile); } else { snprintf(sshd_config, sizeof(sshd_config), config_string, second_sshd ? TORTURE_SSHD_SRV1_IPV4 : TORTURE_SSHD_SRV_IPV4, second_sshd ? TORTURE_SSHD_SRV1_IPV6 : TORTURE_SSHD_SRV_IPV6, - "HostKey", - ed25519_hostkey, - "HostKey", - rsa_hostkey, - "HostKey", - ecdsa_hostkey, + s->disable_hostkeys ? "" : "HostKey", s->disable_hostkeys ? "" : ed25519_hostkey, + s->disable_hostkeys ? "" : "HostKey", s->disable_hostkeys ? "" : rsa_hostkey, + s->disable_hostkeys ? "" : "HostKey", s->disable_hostkeys ? "" : ecdsa_hostkey, trusted_ca_pubkey, sftp_server, usepam,