diff options
author | Colin Watson <cjwatson@debian.org> | 2016-01-14 15:07:15 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-01-14 15:27:10 +0000 |
commit | 4810a3bdc4fe716b6ea91518e920785e4af83a26 (patch) | |
tree | 37a1d7f0ab88c9b3160d1dc35642c4f050f00662 /readconf.c | |
parent | 384abfcda5999e864f1de256f90e4479ccbeabd5 (diff) | |
parent | 003a875a474100d250b6643270ef3874da6591d8 (diff) |
New upstream release (7.1p2).
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/readconf.c b/readconf.c index e4e1cbae3..ee46ad623 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1703,7 +1703,7 @@ initialize_options(Options * options) | |||
1703 | options->tun_remote = -1; | 1703 | options->tun_remote = -1; |
1704 | options->local_command = NULL; | 1704 | options->local_command = NULL; |
1705 | options->permit_local_command = -1; | 1705 | options->permit_local_command = -1; |
1706 | options->use_roaming = -1; | 1706 | options->use_roaming = 0; |
1707 | options->visual_host_key = -1; | 1707 | options->visual_host_key = -1; |
1708 | options->ip_qos_interactive = -1; | 1708 | options->ip_qos_interactive = -1; |
1709 | options->ip_qos_bulk = -1; | 1709 | options->ip_qos_bulk = -1; |
@@ -1887,8 +1887,7 @@ fill_default_options(Options * options) | |||
1887 | options->tun_remote = SSH_TUNID_ANY; | 1887 | options->tun_remote = SSH_TUNID_ANY; |
1888 | if (options->permit_local_command == -1) | 1888 | if (options->permit_local_command == -1) |
1889 | options->permit_local_command = 0; | 1889 | options->permit_local_command = 0; |
1890 | if (options->use_roaming == -1) | 1890 | options->use_roaming = 0; |
1891 | options->use_roaming = 1; | ||
1892 | if (options->visual_host_key == -1) | 1891 | if (options->visual_host_key == -1) |
1893 | options->visual_host_key = 0; | 1892 | options->visual_host_key = 0; |
1894 | if (options->ip_qos_interactive == -1) | 1893 | if (options->ip_qos_interactive == -1) |