pool/xrdp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 748003 from home:yfjiang:branches:X11:RemoteDesktop

Browse Source 
- Make mkpamrules additionally support SUSE's usage of
  /usr/etc/pam.d (boo#1156094, gh#neutrinolabs/xrdp!1442):
  https://lists.opensuse.org/opensuse-factory/2019-08/msg00113.html

OBS-URL: https://build.opensuse.org/request/show/748003
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=69
This commit is contained in:
Tomáš Chvátal 2019-11-13 08:06:56 +00:00 committed by Git OBS Bridge
parent 80f74512bd
commit 4e94f00afc
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xrdp-mkpamrules-support-usr-etc-distconfdir.patch Normal file
View File

@ -0,0 +1,24 @@
Index: xrdp-0.9.11/instfiles/pam.d/mkpamrules
===================================================================
--- xrdp-0.9.11.orig/instfiles/pam.d/mkpamrules
+++ xrdp-0.9.11/instfiles/pam.d/mkpamrules
@@ -8,6 +8,7 @@ outfile="$3"
service="xrdp-sesman"
pamdir="/etc/pam.d"
+pamdir_suse="/usr/etc/pam.d"
guess_rules ()
{
@@ -16,6 +17,11 @@ guess_rules ()
return
fi
+ if test -s "$pamdir_suse/common-account"; then
+ rules="suse"
+ return
+ fi
+
if test -s "$pamdir/common-account"; then
if grep "^@include" "$pamdir/passwd" >/dev/null 2>&1; then
rules="debian"

8
xrdp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 13 03:23:15 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
- Make mkpamrules additionally support SUSE's usage of
/usr/etc/pam.d (boo#1156094, gh#neutrinolabs/xrdp!1442):
https://lists.opensuse.org/opensuse-factory/2019-08/msg00113.html
-------------------------------------------------------------------
Mon Sep 16 03:34:10 UTC 2019 - Felix Zhang <fezhang@suse.com>

3
xrdp.spec
View File

@ -54,6 +54,8 @@ Patch13: xrdp-bsc965647-allow-admin-choose-desktop.patch
Patch14: xrdp-fate318398-change-expired-password.patch
# PATCH-FEATURE-SLE xrdp-fate319683-allow-vnc-resizing.patch fate#319683 bsc#948062 - fezhang@suse.com -- allow resizing in VNC sessions.
Patch15: xrdp-fate319683-allow-vnc-resizing.patch
# PATCH-FIX-UPSTREAM xrdp-mkpamrules-support-usr-etc-distconfdir.patch boo#1156094 gh#neutrinolabs/xrdp!1442 - yfjiang@suse.com -- Probe both /usr/etc/pam.d and /etc/pam.d when generating the xrdp-sesman pam rule.
Patch16: xrdp-mkpamrules-support-usr-etc-distconfdir.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
@ -112,6 +114,7 @@ This package contains libraries for the JPEG2000 codec for RDP.
%patch14 -p1
%patch15 -p1
%endif
%patch16 -p1
%build
sh ./bootstrap