|
 |
674526 |
diff --git a/servconf.c b/servconf.c
|
|
|
674526 |
index ad5869b..1171c33 100644
|
|
|
674526 |
--- a/servconf.c
|
|
|
674526 |
+++ b/servconf.c
|
|
|
674526 |
@@ -1990,6 +1990,8 @@ dump_cfg_strarray_oneline(ServerOpCodes code, u_int count, char **vals)
|
|
|
674526 |
{
|
|
|
674526 |
u_int i;
|
|
|
674526 |
|
|
|
674526 |
+ if (count <= 0)
|
|
|
674526 |
+ return;
|
|
|
674526 |
printf("%s", lookup_opcode_name(code));
|
|
|
674526 |
for (i = 0; i < count; i++)
|
|
|
674526 |
printf(" %s", vals[i]);
|
|
|
674526 |
@@ -2028,7 +2030,7 @@ dump_config(ServerOptions *o)
|
|
|
674526 |
|
|
|
674526 |
/* integer arguments */
|
|
|
674526 |
#ifdef USE_PAM
|
|
|
674526 |
- dump_cfg_int(sUsePAM, o->use_pam);
|
|
|
674526 |
+ dump_cfg_fmtint(sUsePAM, o->use_pam);
|
|
|
674526 |
#endif
|
|
|
674526 |
dump_cfg_int(sServerKeyBits, o->server_key_bits);
|
|
|
674526 |
dump_cfg_int(sLoginGraceTime, o->login_grace_time);
|
|
|
674526 |
@@ -2084,6 +2086,7 @@ dump_config(ServerOptions *o)
|
|
|
674526 |
dump_cfg_fmtint(sShowPatchLevel, o->show_patchlevel);
|
|
|
674526 |
dump_cfg_fmtint(sUseDNS, o->use_dns);
|
|
|
674526 |
dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);
|
|
|
674526 |
+ dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding);
|
|
|
674526 |
dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);
|
|
|
674526 |
dump_cfg_fmtint(sKerberosUseKuserok, o->use_kuserok);
|
|
|
674526 |
dump_cfg_fmtint(sGssEnablek5users, o->enable_k5users);
|
|
|
674526 |
@@ -2094,14 +2097,15 @@ dump_config(ServerOptions *o)
|
|
|
674526 |
dump_cfg_string(sCiphers, o->ciphers ? o->ciphers :
|
|
|
674526 |
cipher_alg_list(',', 0));
|
|
|
674526 |
dump_cfg_string(sMacs, o->macs ? o->macs : mac_alg_list(','));
|
|
|
674526 |
- dump_cfg_string(sBanner, o->banner);
|
|
|
674526 |
+ dump_cfg_string(sBanner, o->banner == NULL ? "none" : o->banner);
|
|
|
674526 |
dump_cfg_string(sForceCommand, o->adm_forced_command);
|
|
|
674526 |
dump_cfg_string(sChrootDirectory, o->chroot_directory);
|
|
|
674526 |
dump_cfg_string(sTrustedUserCAKeys, o->trusted_user_ca_keys);
|
|
|
674526 |
dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
|
|
|
674526 |
dump_cfg_string(sAuthorizedPrincipalsFile,
|
|
|
674526 |
o->authorized_principals_file);
|
|
|
674526 |
- dump_cfg_string(sVersionAddendum, o->version_addendum);
|
|
|
674526 |
+ dump_cfg_string(sVersionAddendum, *o->version_addendum == '\0' ?
|
|
|
674526 |
+ "none" : o->version_addendum);
|
|
|
674526 |
dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
|
|
|
674526 |
dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
|
|
|
674526 |
dump_cfg_string(sHostKeyAgent, o->host_key_agent);
|
|
|
674526 |
@@ -2117,7 +2121,7 @@ dump_config(ServerOptions *o)
|
|
|
674526 |
o->authorized_keys_files);
|
|
|
674526 |
dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,
|
|
|
674526 |
o->host_key_files);
|
|
|
674526 |
- dump_cfg_strarray(sHostKeyFile, o->num_host_cert_files,
|
|
|
674526 |
+ dump_cfg_strarray(sHostCertificate, o->num_host_cert_files,
|
|
|
674526 |
o->host_cert_files);
|
|
|
674526 |
dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);
|
|
|
674526 |
dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);
|
|
|
674526 |
diff --git a/ssh.1 b/ssh.1
|
|
|
674526 |
index f65e42f..4a7d1cd 100644
|
|
|
674526 |
--- a/ssh.1
|
|
|
674526 |
+++ b/ssh.1
|
|
|
674526 |
@@ -444,7 +444,11 @@ For full details of the options listed below, and their possible values, see
|
|
|
674526 |
.It GatewayPorts
|
|
|
674526 |
.It GlobalKnownHostsFile
|
|
|
674526 |
.It GSSAPIAuthentication
|
|
|
674526 |
+.It GSSAPIKeyExchange
|
|
|
674526 |
+.It GSSAPIClientIdentity
|
|
|
674526 |
.It GSSAPIDelegateCredentials
|
|
|
674526 |
+.It GSSAPIRenewalForcesRekey
|
|
|
674526 |
+.It GSSAPITrustDns
|
|
|
674526 |
.It HashKnownHosts
|
|
|
674526 |
.It Host
|
|
|
674526 |
.It HostbasedAuthentication
|