config: Do not parse unsupported ControlPath/ControlMaster

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 82b363f294dc318c9a20ffcbfe16dfa3e082cfed)

Author: Jakuje

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},

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);
 }
 
 /**

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);