Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / libssh
Commits: d776de87 by Christian Hesse at 2024-08-30T17:45:36+02:00 remove the unused patch - - - - - 1 changed file: - − 0001-config-Do-not-parse-unsupported-ControlPath-ControlMaster.patch Changes: ===================================== 0001-config-Do-not-parse-unsupported-ControlPath-ControlMaster.patch deleted ===================================== @@ -1,73 +0,0 @@ -From 82b363f294dc318c9a20ffcbfe16dfa3e082cfed Mon Sep 17 00:00:00 2001 -From: Jakub Jelen <[email protected]> -Date: Wed, 14 Aug 2024 10:27:24 +0200 -Subject: [PATCH] config: Do not parse unsupported ControlPath/ControlMaster - -Signed-off-by: Jakub Jelen <[email protected]> -Reviewed-by: Andreas Schneider <[email protected]> ---- - src/config.c | 4 ++-- - tests/unittests/torture_config.c | 6 +++--- - tests/unittests/torture_options.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/config.c b/src/config.c -index 774b35663..a2ef639d6 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -132,9 +132,9 @@ static struct ssh_config_keyword_table_s ssh_config_keyword_table[] = { - { "verifyhostkeydns", SOC_UNSUPPORTED}, - { "visualhostkey", SOC_UNSUPPORTED}, - { "clearallforwardings", SOC_NA}, -- { "controlmaster", SOC_CONTROLMASTER}, -+ { "controlmaster", SOC_NA}, - { "controlpersist", SOC_NA}, -- { "controlpath", SOC_CONTROLPATH}, -+ { "controlpath", SOC_NA}, - { "dynamicforward", SOC_NA}, - { "escapechar", SOC_NA}, - { "exitonforwardfailure", SOC_NA}, -diff --git a/tests/unittests/torture_config.c b/tests/unittests/torture_config.c -index 4d8d8e448..2631869a9 100644 ---- a/tests/unittests/torture_config.c -+++ b/tests/unittests/torture_config.c -@@ -1404,7 +1404,7 @@ static void torture_config_control_path(void **state, - torture_reset_config(session); - ssh_options_set(session, SSH_OPTIONS_HOST, "simple"); - _parse_config(session, file, string, SSH_OK); -- assert_string_equal(session->opts.control_path, "/tmp/ssh-%r@%h:%p"); -+ assert_null(session->opts.control_path); - - torture_reset_config(session); - ssh_options_set(session, SSH_OPTIONS_HOST, "none"); -@@ -1439,12 +1439,12 @@ static void torture_config_control_master(void **state, - torture_reset_config(session); - ssh_options_set(session, SSH_OPTIONS_HOST, "simple"); - _parse_config(session, file, string, SSH_OK); -- assert_int_equal(session->opts.control_master, SSH_CONTROL_MASTER_AUTO); -+ assert_int_equal(session->opts.control_master, SSH_CONTROL_MASTER_NO); - - torture_reset_config(session); - ssh_options_set(session, SSH_OPTIONS_HOST, "none"); - _parse_config(session, file, string, SSH_OK); -- assert_int_equal(session->opts.control_master, SSH_CONTROL_MASTER_YES); -+ assert_int_equal(session->opts.control_master, SSH_CONTROL_MASTER_NO); - } - - /** -diff --git a/tests/unittests/torture_options.c b/tests/unittests/torture_options.c -index 22e84863e..2acc59713 100644 ---- a/tests/unittests/torture_options.c -+++ b/tests/unittests/torture_options.c -@@ -1350,7 +1350,7 @@ static void torture_options_copy(void **state) - assert_string_equal(session->opts.pubkey_accepted_types, - new->opts.pubkey_accepted_types); - assert_string_equal(session->opts.ProxyCommand, new->opts.ProxyCommand); -- assert_string_equal(session->opts.control_path, new->opts.control_path); -+ assert_null(new->opts.control_path); - /* TODO custombanner */ - assert_int_equal(session->opts.timeout, new->opts.timeout); - assert_int_equal(session->opts.timeout_usec, new->opts.timeout_usec); --- -GitLab - View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/libssh/-/commit/d776de8708bf6038144642512706d879049c7eab -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/libssh/-/commit/d776de8708bf6038144642512706d879049c7eab You're receiving this email because of your account on gitlab.archlinux.org.
