packages/pam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!45 [sync] PR-44: 【同步】fix cannot open database file

Browse Source 
From: @openeuler-sync-bot
Reviewed-by: @zhujianwei001
Signed-off-by: @zhujianwei001
This commit is contained in:
openeuler-ci-bot 2021-09-16 09:05:11 +00:00 committed by Gitee
commit f85a7ae99a
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
0001-bugfix-cannot-open-database-file.patch Normal file
View File

@ -0,0 +1,50 @@
From 3bd5a1244a35974c8a0e21a9ac866cb5935f662e Mon Sep 17 00:00:00 2001
From: Hongxun Ren <renhongxun@huawei.com>
Date: Wed, 15 Sep 2021 10:05:49 +0800
Subject: [PATCH] bugfix cannot open database file
---
modules/pam_userdb/pam_userdb.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c
index dc2ca23..a9992a7 100644
--- a/modules/pam_userdb/pam_userdb.c
+++ b/modules/pam_userdb/pam_userdb.c
@@ -147,13 +147,30 @@ user_lookup (pam_handle_t *pamh, const char *database, const char *cryptmode,
{
DBM *dbm;
datum key, data;
+ int retval;
+ /* Init the DB file. */
+ retval = dbminit(database);
+ if (retval) {
+ pam_syslog(pamh, LOG_ERR,
+ "user_lookup: could not init database `%s': %m", database);
+ return -2;
+ }
/* Open the DB file. */
dbm = dbm_open(database, O_RDONLY, 0644);
if (dbm == NULL) {
- pam_syslog(pamh, LOG_ERR,
- "user_lookup: could not open database `%s': %m", database);
- return -2;
+ retval = dbminit(database);
+ if (retval){
+ pam_syslog(pamh, LOG_ERR,
+ "user_lookup: could not re-init database `%s': %m", database);
+ } else {
+ dbm = dbm_open(database, O_RDONLY, 0644);
+ if(dbm == NULL) {
+ pam_syslog(pamh, LOG_ERR,
+ "user_lookup: could not open database `%s': %m", database);
+ return -2;
+ }
+ }
}
/* dump out the database contents for debugging */
--
1.8.3.1

6
pam.spec
View File

@ -4,7 +4,7 @@
%define _pamconfdir %{_sysconfdir}/pam.d %define _pamconfdir %{_sysconfdir}/pam.d
Name: pam Name: pam
Version: 1.4.0 Version: 1.4.0
Release: 5 Release: 6
Summary: Pluggable Authentication Modules for Linux Summary: Pluggable Authentication Modules for Linux
License: BSD and GPLv2+ License: BSD and GPLv2+
URL: http://www.linux-pam.org/ URL: http://www.linux-pam.org/
@ -28,6 +28,7 @@ Patch6: Prevent-SEGFAULT-for-unknown-UID.patch
Patch7: change-ndbm-to-gdbm.patch Patch7: change-ndbm-to-gdbm.patch
Patch6000: backport-Move-read_passwords-function-from-pam_unix-to-pam_inline.h.patch Patch6000: backport-Move-read_passwords-function-from-pam_unix-to-pam_inline.h.patch
Patch6001: backport-add-helper-to-handle-SELinux.patch Patch6001: backport-add-helper-to-handle-SELinux.patch
Patch9000: 0001-bugfix-cannot-open-database-file.patch
BuildRequires: autoconf automake libtool bison flex sed cracklib-devel gdbm-devel BuildRequires: autoconf automake libtool bison flex sed cracklib-devel gdbm-devel
BuildRequires: perl-interpreter pkgconfig gettext-devel libtirpc-devel libnsl2-devel BuildRequires: perl-interpreter pkgconfig gettext-devel libtirpc-devel libnsl2-devel
@ -180,6 +181,9 @@ fi
%changelog %changelog
* Thu Sep 16 2021 renhongxun <renhongxun@huawei.com> - 1.4.0-6
- bugfix on cannot open database file
* Mon May 17 2021 shixuantong <shixuantong@huawei.com> - 1.4.0-5 * Mon May 17 2021 shixuantong <shixuantong@huawei.com> - 1.4.0-5
- fix error in change-ndbm-to-gdbm.patch and sync community patch - fix error in change-ndbm-to-gdbm.patch and sync community patch