diff --git a/xrdp-fix-search-pam-vendor-dir.patch b/xrdp-fix-search-pam-vendor-dir.patch new file mode 100644 index 0000000..5fa0e4e --- /dev/null +++ b/xrdp-fix-search-pam-vendor-dir.patch @@ -0,0 +1,14 @@ +Index: xrdp-0.9.20/sesman/verify_user_pam.c +=================================================================== +--- xrdp-0.9.20.orig/sesman/verify_user_pam.c ++++ xrdp-0.9.20/sesman/verify_user_pam.c +@@ -197,7 +197,8 @@ get_service_name(char *service_name) + service_name[0] = 0; + + if (g_file_exist("/etc/pam.d/xrdp-sesman") || +- g_file_exist(XRDP_SYSCONF_PATH "/pam.d/xrdp-sesman")) ++ g_file_exist(XRDP_SYSCONF_PATH "/pam.d/xrdp-sesman") || ++ g_file_exist("/usr/lib/pam.d/xrdp-sesman")) + { + g_strncpy(service_name, "xrdp-sesman", 255); + } diff --git a/xrdp.changes b/xrdp.changes index 26e953d..22bfb84 100644 --- a/xrdp.changes +++ b/xrdp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 13 09:18:44 UTC 2023 - Yifan Jiang + +- Add xrdp-fix-search-pam-vendor-dir.patch: Search pam + configuration file in the vendor directory /usr/lib/pam.d/ + (bsc#1208121). + ------------------------------------------------------------------- Mon Jan 16 14:49:33 UTC 2023 - Stefan Schubert diff --git a/xrdp.spec b/xrdp.spec index a121a37..886ef3c 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -38,6 +38,8 @@ Source7: sesman.ini Source100: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE xrdp-pam.patch - hfiguiere@novell.com refreshed by ftake@geeko.jp Patch1: xrdp-pam.patch +# PATCH-FIX-OPENSUSE xrdp-fix-search-pam-vendor-dir.patch bsc#1208121 - yfjiang@suse.com -- Search pam configuration file in the vendor directory /usr/lib/pam.d/ +Patch2: xrdp-fix-search-pam-vendor-dir.patch # PATCH-FIX-OPENSUSE xrdp-disable-8-bpp-vnc-support.patch bsc#991059 - fezhang@suse.com -- disable 8 bpp support for vnc connections Patch4: xrdp-disable-8-bpp-vnc-support.patch # PATCH-FIX-OPENSUSE xrdp-support-KillDisconnected-for-Xvnc.patch boo#1101506 - fezhang@suse.com -- Support the KillDisconnected option for TigerVNC Xvnc sessions @@ -124,6 +126,7 @@ This package contains libraries for the JPEG2000 codec for RDP. %prep %setup -q %patch1 -p1 +%patch2 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1