kentpeacock / rpms / openssh

Forked from rpms/openssh 2 years ago
Clone
b58e57
diff -up openssh-7.4p1/servconf.c.sshd-t openssh-7.4p1/servconf.c
b58e57
--- openssh-7.4p1/servconf.c.sshd-t	2017-02-09 10:19:56.859306131 +0100
b58e57
+++ openssh-7.4p1/servconf.c	2017-02-09 10:22:07.895104402 +0100
b58e57
@@ -2337,7 +2337,7 @@ dump_config(ServerOptions *o)
b58e57
 	dump_cfg_string(sXAuthLocation, o->xauth_location);
b58e57
 	dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : KEX_SERVER_ENCRYPT);
b58e57
 	dump_cfg_string(sMacs, o->macs ? o->macs : KEX_SERVER_MAC);
b58e57
-	dump_cfg_string(sBanner, o->banner);
b58e57
+	dump_cfg_string(sBanner, o->banner == NULL ? "none" : o->banner);
b58e57
 	dump_cfg_string(sForceCommand, o->adm_forced_command);
b58e57
 	dump_cfg_string(sChrootDirectory, o->chroot_directory);
b58e57
 	dump_cfg_string(sTrustedUserCAKeys, o->trusted_user_ca_keys);
b58e57
diff -up openssh-7.4p1/ssh.1.sshd-t openssh-7.4p1/ssh.1
b58e57
--- openssh-7.4p1/ssh.1.sshd-t	2017-02-09 10:19:56.823306172 +0100
b58e57
+++ openssh-7.4p1/ssh.1	2017-02-09 10:19:56.859306131 +0100
b58e57
@@ -512,7 +512,11 @@ For full details of the options listed b
b58e57
 .It GatewayPorts
b58e57
 .It GlobalKnownHostsFile
b58e57
 .It GSSAPIAuthentication
b58e57
+.It GSSAPIKeyExchange
b58e57
+.It GSSAPIClientIdentity
b58e57
 .It GSSAPIDelegateCredentials
b58e57
+.It GSSAPIRenewalForcesRekey
b58e57
+.It GSSAPITrustDns
b58e57
 .It HashKnownHosts
b58e57
 .It Host
b58e57
 .It HostbasedAuthentication