kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/security/openssh-portable/files/patch-servconf.c

52 lines
1.6 KiB
C
Raw Normal View History

Add lost metadata on why this patch exists
2018-06-19 17:34:13 +02:00
r99048 | des | 2002-06-29 05:51:56 -0500 (Sat, 29 Jun 2002) | 4 lines
Changed paths:
M /head/crypto/openssh/myproposal.h
M /head/crypto/openssh/readconf.c
M /head/crypto/openssh/servconf.c
Apply FreeBSD's configuration defaults.
- Fix and update HPN patch to latest from upstream but leave it off by default. - Add an 'hpn' FLAVOR to produce a package for users with HPN and NONECIPHER enabled. Approved by: portmgr (implicit)
2018-06-28 05:38:32 +02:00
--- servconf.c.orig 2018-06-27 17:18:19.513676000 -0700
+++ servconf.c 2018-06-27 17:19:38.133882000 -0700
@@ -41,6 +41,7 @@
#include <util.h>
#endif
Stop forcing the port version string into the server banner. The port now uses VersionAddendum in the sshd_config to allow overriding this value. Using "none" allows disabling the default of the port version string. The default is kept to show the port version string to remain close to the base version. Support for the client VersionAddendum may be added soon as well to better match base and not give surprises when switching from base to the port. PR: 193127 Requested by: many, including myself when this was broken years ago.
2015-03-23 05:23:08 +01:00
- Fix and update HPN patch to latest from upstream but leave it off by default. - Add an 'hpn' FLAVOR to produce a package for users with HPN and NONECIPHER enabled. Approved by: portmgr (implicit)
2018-06-28 05:38:32 +02:00
+#include "version.h"
#include "openbsd-compat/sys-queue.h"
#include "xmalloc.h"
#include "ssh.h"
@@ -251,7 +252,11 @@ fill_default_server_options(ServerOptions *options)
- Update to 6.2p2 - The LPK patch has been updated but is obsolete, deprecated and untested. It has been replaced by AuthorizedKeysCommand - The upstream HPN's last update was for 6.1 and is mostly abandoned. The patch has had bugs since 5.9. I have reworked it and split into into HPN and AES_THREADED options. The debugging/logging part of the patch is incomplete. I may change the patch to more closely match our base version eventually. - The KERB_GSSAPI option has been removed as the patch has not been updated by upstream since 5.7 - sshd VersionAddendum is currently not working as intended; it will be fixed later to allow removing the port/pkg version. - Update our patchset to match latest base version - Bring in ssh-agent -x support from base - I incrementally updated the port from 5.8 up to 6.2p2 along with patches. You can find all of the versions at https://github.com/bdrewery/openssh Changes: http://www.openssh.com/txt/release-5.9 http://www.openssh.org/txt/release-6.0 http://www.openssh.org/txt/release-6.1 http://www.openssh.org/txt/release-6.2 http://www.openssh.org/txt/release-6.2p2
2013-05-17 21:47:35 +02:00
- Update to 4.4p1. - Disable temporary HPN patch until HPN release new version. - Fix rc.d script path in sshd.8 - Add FreeBSD-${PKGNAME} in SSH_VERSION and SSH_RELEASE like src does. - Sync patches with src. Security: CVE-2006-4924, CVE-2006-5051
2006-10-01 04:15:00 +02:00
/* Portable-specific options */
if (options->use_pam == -1)
Fix nologin check when PAM option is disabled in the port. PR: 229147 Submitted by: Robert Schulze <rs@bytecamp.net>
2018-06-19 17:42:32 +02:00
+#ifdef USE_PAM
- Update to 4.4p1. - Disable temporary HPN patch until HPN release new version. - Fix rc.d script path in sshd.8 - Add FreeBSD-${PKGNAME} in SSH_VERSION and SSH_RELEASE like src does. - Sync patches with src. Security: CVE-2006-4924, CVE-2006-5051
2006-10-01 04:15:00 +02:00
+ options->use_pam = 1;
Fix nologin check when PAM option is disabled in the port. PR: 229147 Submitted by: Robert Schulze <rs@bytecamp.net>
2018-06-19 17:42:32 +02:00
+#else
options->use_pam = 0;
+#endif
- Update to 4.4p1. - Disable temporary HPN patch until HPN release new version. - Fix rc.d script path in sshd.8 - Add FreeBSD-${PKGNAME} in SSH_VERSION and SSH_RELEASE like src does. - Sync patches with src. Security: CVE-2006-4924, CVE-2006-5051
2006-10-01 04:15:00 +02:00
- Update to OpenSSH 7.0p1 - Update X509 patch to 8.5 Changes: http://www.openssh.com/txt/release-7.0
2015-08-18 17:42:52 +02:00
/* Standard Options */
Fix nologin check when PAM option is disabled in the port. PR: 229147 Submitted by: Robert Schulze <rs@bytecamp.net>
2018-06-19 17:42:32 +02:00
if (options->num_host_key_files == 0) {
- Fix and update HPN patch to latest from upstream but leave it off by default. - Add an 'hpn' FLAVOR to produce a package for users with HPN and NONECIPHER enabled. Approved by: portmgr (implicit)
2018-06-28 05:38:32 +02:00
@@ -291,7 +296,7 @@ fill_default_server_options(ServerOptions *options)
- Update to 4.4p1. - Disable temporary HPN patch until HPN release new version. - Fix rc.d script path in sshd.8 - Add FreeBSD-${PKGNAME} in SSH_VERSION and SSH_RELEASE like src does. - Sync patches with src. Security: CVE-2006-4924, CVE-2006-5051
2006-10-01 04:15:00 +02:00
if (options->print_lastlog == -1)
options->print_lastlog = 1;
if (options->x11_forwarding == -1)
- options->x11_forwarding = 0;
+ options->x11_forwarding = 1;
if (options->x11_display_offset == -1)
options->x11_display_offset = 10;
if (options->x11_use_localhost == -1)
- Fix and update HPN patch to latest from upstream but leave it off by default. - Add an 'hpn' FLAVOR to produce a package for users with HPN and NONECIPHER enabled. Approved by: portmgr (implicit)
2018-06-28 05:38:32 +02:00
@@ -331,7 +336,11 @@ fill_default_server_options(ServerOptions *options)
- Update to OpenSSH 7.0p1 - Update X509 patch to 8.5 Changes: http://www.openssh.com/txt/release-7.0
2015-08-18 17:42:52 +02:00
if (options->gss_strict_acceptor == -1)
Fix nologin check when PAM option is disabled in the port. PR: 229147 Submitted by: Robert Schulze <rs@bytecamp.net>
2018-06-19 17:42:32 +02:00
options->gss_strict_acceptor = 1;
- Update to 4.4p1. - Disable temporary HPN patch until HPN release new version. - Fix rc.d script path in sshd.8 - Add FreeBSD-${PKGNAME} in SSH_VERSION and SSH_RELEASE like src does. - Sync patches with src. Security: CVE-2006-4924, CVE-2006-5051
2006-10-01 04:15:00 +02:00
if (options->password_authentication == -1)
+#ifdef USE_PAM
+ options->password_authentication = 0;
+#else
options->password_authentication = 1;
+#endif
if (options->kbd_interactive_authentication == -1)
options->kbd_interactive_authentication = 0;
if (options->challenge_response_authentication == -1)
Reference in a new issue Copy permalink