From fda43e66ea94f53848c031bb8fc301d9fb1f1573 Mon Sep 17 00:00:00 2001 From: Itamar Reis Peixoto Date: Tue, 8 Sep 2009 16:06:52 +0000 Subject: [PATCH] - fix pam.d --- import.log | 1 + xrdp-pam-auth.patch | 9 +++++++++ xrdp.spec | 13 +++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 xrdp-pam-auth.patch diff --git a/import.log b/import.log index 385ed2a..82c4e0e 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ xrdp-0_5_0-0_2_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272824 xrdp-0_5_0-0_4_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.4.20090811cvs.fc12.src.rpm:1252103027 +xrdp-0_5_0-0_5_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252425624 diff --git a/xrdp-pam-auth.patch b/xrdp-pam-auth.patch new file mode 100644 index 0000000..d1bf6eb --- /dev/null +++ b/xrdp-pam-auth.patch @@ -0,0 +1,9 @@ +diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman +--- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman 2008-04-29 04:51:34.000000000 -0300 ++++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman 2009-09-08 03:15:46.139495177 -0300 +@@ -1,3 +1,3 @@ + #%PAM-1.0 +-auth required pam_unix.so shadow nullok +-account required pam_unix.so ++auth include system-auth ++account include system-auth diff --git a/xrdp.spec b/xrdp.spec index bb04c6d..d8430fa 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -4,7 +4,7 @@ Summary: Open source remote desktop protocol (RDP) server Name: xrdp Version: 0.5.0 -Release: 0.4.%{cvs}%{?dist} +Release: 0.5.%{cvs}%{?dist} License: GPLv2+ with exceptions Group: Applications/Internet URL: http://xrdp.sourceforge.net/ @@ -24,6 +24,8 @@ URL: http://xrdp.sourceforge.net/ Source0: %{name}-%{version}.%{cvs}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: xrdp-pam-auth.patch + Source1: xrdp.init Source2: xrdp.sysconfig Source3: xrdp.logrotate @@ -54,6 +56,7 @@ terminal server / remote desktop clients. %prep %setup -q -n %{name}-%{version}.%{cvs} +%patch0 -p2 # remove unused modules from xrdp login combobox %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini @@ -65,11 +68,6 @@ terminal server / remote desktop clients. # increase encryption to 128 bit's %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini -#include system-auth into pam.d/xrdp-sesman -echo "auth include system-auth" >> instfiles/pam.d/xrdp-sesman -echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman - - #fix wrong permission %{__chmod} 644 keygen/keygen.c @@ -171,6 +169,9 @@ rm -rf %{buildroot} %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini %changelog +* Tue Sep 08 2009 Itamar Reis Peixoto - 0.5.0-0.5.20090811cvs +- fix xrdp-sesman pam.d to uses system-auth + * Fri Sep 04 2009 Itamar Reis Peixoto - 0.5.0-0.4.20090811cvs - increase encryption to 128 bit's - include system-auth into /etc/pam.d/xrdp-sesman