2015-03-20 13:56:04 +00:00
|
|
|
diff -up openssh-6.8p1/servconf.c.sshdt openssh-6.8p1/servconf.c
|
|
|
|
|
--- openssh-6.8p1/servconf.c.sshdt 2015-03-18 13:07:24.457858235 +0100
|
|
|
|
|
+++ openssh-6.8p1/servconf.c 2015-03-18 13:09:27.253557396 +0100
|
|
|
|
|
@@ -2118,6 +2118,8 @@ dump_cfg_strarray_oneline(ServerOpCodes
|
2015-02-03 13:06:59 +00:00
|
|
|
{
|
|
|
|
|
u_int i;
|
|
|
|
|
|
|
|
|
|
+ if (count <= 0)
|
|
|
|
|
+ return;
|
|
|
|
|
printf("%s", lookup_opcode_name(code));
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
|
printf(" %s", vals[i]);
|
2015-03-20 13:56:04 +00:00
|
|
|
@@ -2156,7 +2158,7 @@ dump_config(ServerOptions *o)
|
2015-02-03 13:06:59 +00:00
|
|
|
|
|
|
|
|
/* integer arguments */
|
|
|
|
|
#ifdef USE_PAM
|
|
|
|
|
- dump_cfg_int(sUsePAM, o->use_pam);
|
|
|
|
|
+ dump_cfg_fmtint(sUsePAM, o->use_pam);
|
|
|
|
|
#endif
|
|
|
|
|
dump_cfg_int(sServerKeyBits, o->server_key_bits);
|
|
|
|
|
dump_cfg_int(sLoginGraceTime, o->login_grace_time);
|
2015-03-20 13:56:04 +00:00
|
|
|
@@ -2166,6 +2168,7 @@ dump_config(ServerOptions *o)
|
2015-02-03 13:06:59 +00:00
|
|
|
dump_cfg_int(sMaxSessions, o->max_sessions);
|
|
|
|
|
dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
|
|
|
|
|
dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
|
|
|
|
|
+ dump_cfg_int(sStreamLocalBindMask, o->fwd_opts.streamlocal_bind_mask);
|
|
|
|
|
|
|
|
|
|
/* formatted integer arguments */
|
|
|
|
|
dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login);
|
2015-03-20 13:56:04 +00:00
|
|
|
@@ -2213,6 +2216,7 @@ dump_config(ServerOptions *o)
|
2015-02-03 13:06:59 +00:00
|
|
|
dump_cfg_fmtint(sShowPatchLevel, o->show_patchlevel);
|
|
|
|
|
dump_cfg_fmtint(sUseDNS, o->use_dns);
|
|
|
|
|
dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);
|
|
|
|
|
+ dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding);
|
|
|
|
|
dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);
|
|
|
|
|
dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);
|
|
|
|
|
dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);
|
2015-03-20 13:56:04 +00:00
|
|
|
@@ -2231,7 +2235,8 @@ dump_config(ServerOptions *o)
|
2015-02-03 13:06:59 +00:00
|
|
|
dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
|
|
|
|
|
dump_cfg_string(sAuthorizedPrincipalsFile,
|
|
|
|
|
o->authorized_principals_file);
|
|
|
|
|
- dump_cfg_string(sVersionAddendum, o->version_addendum);
|
|
|
|
|
+ dump_cfg_string(sVersionAddendum, *o->version_addendum == '\0'
|
|
|
|
|
+ ? "none" : o->version_addendum);
|
|
|
|
|
dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
|
|
|
|
|
dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
|
|
|
|
|
dump_cfg_string(sHostKeyAgent, o->host_key_agent);
|
2015-03-20 13:56:04 +00:00
|
|
|
@@ -2251,7 +2256,7 @@ dump_config(ServerOptions *o)
|
2015-02-03 13:06:59 +00:00
|
|
|
o->authorized_keys_files);
|
|
|
|
|
dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,
|
|
|
|
|
o->host_key_files);
|
|
|
|
|
- dump_cfg_strarray(sHostKeyFile, o->num_host_cert_files,
|
|
|
|
|
+ dump_cfg_strarray(sHostCertificate, o->num_host_cert_files,
|
|
|
|
|
o->host_cert_files);
|
|
|
|
|
dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);
|
|
|
|
|
dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);
|
