svn commit: r472797 - head/security/openssh-portable/files
Bryan Drewery
bdrewery at FreeBSD.org
Tue Jun 19 15:42:33 UTC 2018
Author: bdrewery
Date: Tue Jun 19 15:42:32 2018
New Revision: 472797
URL: https://svnweb.freebsd.org/changeset/ports/472797
Log:
Fix nologin check when PAM option is disabled in the port.
PR: 229147
Submitted by: Robert Schulze <rs at bytecamp.net>
Modified:
head/security/openssh-portable/files/patch-servconf.c
Modified: head/security/openssh-portable/files/patch-servconf.c
==============================================================================
--- head/security/openssh-portable/files/patch-servconf.c Tue Jun 19 15:34:13 2018 (r472796)
+++ head/security/openssh-portable/files/patch-servconf.c Tue Jun 19 15:42:32 2018 (r472797)
@@ -6,26 +6,29 @@ Changed paths:
Apply FreeBSD's configuration defaults.
---- servconf.c.orig 2015-08-17 20:37:29.913831000 UTC
-+++ servconf.c 2015-08-17 20:37:29.950132000 -0700
-@@ -57,6 +57,7 @@
+--- servconf.c.orig 2018-06-19 09:26:26 UTC
++++ servconf.c
+@@ -63,6 +63,7 @@
#include "auth.h"
#include "myproposal.h"
#include "digest.h"
+#include "version.h"
- static void add_listen_addr(ServerOptions *, char *, int);
- static void add_one_listen_addr(ServerOptions *, char *, int);
-@@ -193,7 +194,7 @@ fill_default_server_options(ServerOption
+ static void add_listen_addr(ServerOptions *, const char *,
+ const char *, int);
+@@ -240,7 +241,11 @@ fill_default_server_options(ServerOption
/* Portable-specific options */
if (options->use_pam == -1)
-- options->use_pam = 0;
++#ifdef USE_PAM
+ options->use_pam = 1;
++#else
+ options->use_pam = 0;
++#endif
/* Standard Options */
- if (options->protocol == SSH_PROTO_UNKNOWN)
-@@ -242,7 +243,7 @@ fill_default_server_options(ServerOption
+ if (options->num_host_key_files == 0) {
+@@ -280,7 +285,7 @@ fill_default_server_options(ServerOption
if (options->print_lastlog == -1)
options->print_lastlog = 1;
if (options->x11_forwarding == -1)
@@ -34,9 +37,9 @@ Apply FreeBSD's configuration defaults.
if (options->x11_display_offset == -1)
options->x11_display_offset = 10;
if (options->x11_use_localhost == -1)
-@@ -288,7 +289,11 @@ fill_default_server_options(ServerOption
+@@ -320,7 +325,11 @@ fill_default_server_options(ServerOption
if (options->gss_strict_acceptor == -1)
- options->gss_strict_acceptor = 0;
+ options->gss_strict_acceptor = 1;
if (options->password_authentication == -1)
+#ifdef USE_PAM
+ options->password_authentication = 0;
More information about the svn-ports-all
mailing list