28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
|
diff -up openssh/servconf.c.sshdt openssh/servconf.c
|
||
|
|
--- openssh/servconf.c.sshdt 2015-06-24 11:42:29.041078704 +0200
|
||
|
|
+++ openssh/servconf.c 2015-06-24 11:44:39.734745802 +0200
|
||
|
|
@@ -2317,7 +2317,7 @@ dump_config(ServerOptions *o)
|
||
|
|
dump_cfg_string(sXAuthLocation, o->xauth_location);
|
||
|
|
dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : KEX_SERVER_ENCRYPT);
|
||
|
|
dump_cfg_string(sMacs, o->macs ? o->macs : KEX_SERVER_MAC);
|
||
|
|
- dump_cfg_string(sBanner, o->banner);
|
||
|
|
+ dump_cfg_string(sBanner, o->banner != NULL ? o->banner : "none");
|
||
|
|
dump_cfg_string(sForceCommand, o->adm_forced_command);
|
||
|
|
dump_cfg_string(sChrootDirectory, o->chroot_directory);
|
||
|
|
dump_cfg_string(sTrustedUserCAKeys, o->trusted_user_ca_keys);
|
||
|
|
diff -up openssh/ssh.1.sshdt openssh/ssh.1
|
||
|
|
--- openssh/ssh.1.sshdt 2015-06-24 11:42:19.565102807 +0200
|
||
|
|
+++ openssh/ssh.1 2015-06-24 11:42:29.042078701 +0200
|
||
|
|
@@ -441,7 +441,11 @@ For full details of the options listed b
|
||
|
|
.It GatewayPorts
|
||
|
|
.It GlobalKnownHostsFile
|
||
|
|
.It GSSAPIAuthentication
|
||
|
|
+.It GSSAPIKeyExchange
|
||
|
|
+.It GSSAPIClientIdentity
|
||
|
|
.It GSSAPIDelegateCredentials
|
||
|
|
+.It GSSAPIRenewalForcesRekey
|
||
|
|
+.It GSSAPITrustDNS
|
||
|
|
.It HashKnownHosts
|
||
|
|
.It Host
|
||
|
|
.It HostbasedAuthentication
|