2020-07-24 15:45:06 +08:00
|
|
|
From 31883f21eff4265b68bb36f67b254adb524db6ae Mon Sep 17 00:00:00 2001
|
2019-09-30 11:10:51 -04:00
|
|
|
From: guoxiaoqi <guoxiaoqi2@huawei.com>
|
2020-07-24 15:45:06 +08:00
|
|
|
Date: Thu, 16 Apr 2020 14:51:44 +0800
|
2019-09-30 11:10:51 -04:00
|
|
|
Subject: [PATCH] bugfix-openssh-6.6p1-log-usepam-no
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
sshd.c | 4 ++--
|
|
|
|
|
sshd_config | 2 +-
|
|
|
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/sshd.c b/sshd.c
|
2020-07-24 15:45:06 +08:00
|
|
|
index c6c03ae..c291a5e 100644
|
2019-09-30 11:10:51 -04:00
|
|
|
--- a/sshd.c
|
|
|
|
|
+++ b/sshd.c
|
2020-07-24 15:45:06 +08:00
|
|
|
@@ -1812,9 +1812,9 @@ main(int ac, char **av)
|
2019-09-30 11:10:51 -04:00
|
|
|
parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name,
|
2020-07-24 15:45:06 +08:00
|
|
|
cfg, &includes, NULL);
|
2019-09-30 11:10:51 -04:00
|
|
|
|
|
|
|
|
- /* 'UsePAM no' is not supported in Fedora */
|
|
|
|
|
+ /* 'UsePAM no' is not supported in openEuler */
|
|
|
|
|
if (! options.use_pam)
|
|
|
|
|
- logit("WARNING: 'UsePAM no' is not supported in Fedora and may cause several problems.");
|
|
|
|
|
+ logit("WARNING: 'UsePAM no' is not supported in openEuler and may cause several problems.");
|
|
|
|
|
|
2021-10-28 16:38:19 +08:00
|
|
|
#ifdef WITH_OPENSSL
|
|
|
|
|
if (options.moduli_file != NULL)
|
2019-09-30 11:10:51 -04:00
|
|
|
diff --git a/sshd_config b/sshd_config
|
2020-07-24 15:45:06 +08:00
|
|
|
index e125992..ebc28b3 100644
|
2019-09-30 11:10:51 -04:00
|
|
|
--- a/sshd_config
|
|
|
|
|
+++ b/sshd_config
|
2020-07-24 15:45:06 +08:00
|
|
|
@@ -87,7 +87,7 @@ AuthorizedKeysFile .ssh/authorized_keys
|
2019-09-30 11:10:51 -04:00
|
|
|
# If you just want the PAM account and session checks to run without
|
|
|
|
|
# PAM authentication, then enable this but set PasswordAuthentication
|
2021-10-28 16:38:19 +08:00
|
|
|
# and KbdInteractiveAuthentication to 'no'.
|
2019-09-30 11:10:51 -04:00
|
|
|
-# WARNING: 'UsePAM no' is not supported in Fedora and may cause several
|
|
|
|
|
+# WARNING: 'UsePAM no' is not supported in openEuler and may cause several
|
|
|
|
|
# problems.
|
2020-07-24 15:45:06 +08:00
|
|
|
#UsePAM no
|
2019-09-30 11:10:51 -04:00
|
|
|
|
|
|
|
|
--
|
2020-07-24 15:45:06 +08:00
|
|
|
2.23.0
|
2019-09-30 11:10:51 -04:00
|
|
|
|