diff options
Diffstat (limited to 'source/x/x11')
-rw-r--r-- | source/x/x11/configure/xdm | 19 | ||||
-rw-r--r-- | source/x/x11/doinst.sh/xdm | 5 | ||||
-rw-r--r-- | source/x/x11/post-install/xdm.post-install | 5 | ||||
-rw-r--r-- | source/x/x11/post-install/xdm/xdm.pamd | 9 |
4 files changed, 38 insertions, 0 deletions
diff --git a/source/x/x11/configure/xdm b/source/x/x11/configure/xdm new file mode 100644 index 000000000..1c7dc7ccd --- /dev/null +++ b/source/x/x11/configure/xdm @@ -0,0 +1,19 @@ +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + XDM_PAM_OPTION="--with-pam" +else + unset XDM_PAM_OPTION +fi + +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ + $XDM_PAM_OPTION \ + --disable-static \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm index 871a3897f..68c356c50 100644 --- a/source/x/x11/doinst.sh/xdm +++ b/source/x/x11/doinst.sh/xdm @@ -9,6 +9,11 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } + +if [ -r etc/pam.d/xdm.new ]; then + config etc/pam.d/xdm.new +fi + for conffile in \ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \ GiveConsole TakeConsole xdm-config ../app-defaults/Chooser ; diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install index 8410a8fa5..31b390d80 100644 --- a/source/x/x11/post-install/xdm.post-install +++ b/source/x/x11/post-install/xdm.post-install @@ -14,6 +14,11 @@ mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsetup_0. cp -a $CWD/post-install/xdm/Xsession $PKG/etc/X11/xdm/Xsession cp -a $CWD/post-install/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0 +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + mkdir -p $PKG/etc/pam.d + cat $CWD/post-install/xdm/xdm.pamd > $PKG/etc/pam.d/xdm.new +fi + chown root:root $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 diff --git a/source/x/x11/post-install/xdm/xdm.pamd b/source/x/x11/post-install/xdm/xdm.pamd new file mode 100644 index 000000000..a3b9decf7 --- /dev/null +++ b/source/x/x11/post-install/xdm/xdm.pamd @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_ck_connector.so +session include postlogin |