From eb81bd1588ba37bb91bde1e334e10c34ec7fd0f6c453f0c83b5e824fb3104b47 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 29 Sep 2020 10:03:13 +0000 Subject: [PATCH] - moved xdm/xdm-np PAM files to /usr/etc/pam.d, since lightdm has been adjusted meanwhile OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=222 --- xdm.changes | 6 ++++++ xdm.spec | 14 ++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xdm.changes b/xdm.changes index 271aa19..b97478f 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 29 09:57:42 UTC 2020 - Stefan Dirsch + +- moved xdm/xdm-np PAM files to /usr/etc/pam.d, since lightdm has + been adjusted meanwhile + ------------------------------------------------------------------- Tue Sep 15 10:16:41 UTC 2020 - Dominique Leuenberger diff --git a/xdm.spec b/xdm.spec index d65cb8c..2fef02a 100644 --- a/xdm.spec +++ b/xdm.spec @@ -124,8 +124,7 @@ tar xf %{SOURCE1} patch -p0 < %{PATCH2} mkdir -p usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm -### authentification error with lightdm when using /usr/etc/pam.d -#mv etc/pam.d usr/etc/ +mv etc/pam.d usr/etc/ rmdir etc/X11/xdm etc/X11 %else patch -p0 < %{PATCH4} @@ -222,14 +221,13 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_unitdir}/display-manager.service /usr/lib/X11/display-manager %config %{_sysconfdir}/logrotate.d/xdm -### authentification failure with lightdm when using /usr/etc/pam.d -#%if 0%{?UsrEtcMove} -#%{_distconfdir}/pam.d/xdm -#%{_distconfdir}/pam.d/xdm-np -#%else +%if 0%{?UsrEtcMove} +%{_distconfdir}/pam.d/xdm +%{_distconfdir}/pam.d/xdm-np +%else %config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm-np -#%endif +%endif %dir %{_localstatedir}/lib/xdm/ %{_fillupdir}/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/