- add support for recording user's login uid to the process attribute

diff --git a/cronie.pam b/cronie.pam
index ab053c5430025ee73df325ea3fc19eeac9b9f759..9f8d098710f762534f4ad926b87682f990951e6e 100644 (file)
--- a/cronie.pam
+++ b/cronie.pam
@@ -2,3 +2,4 @@
 auth           include         system-auth
 account                include         system-auth
 session                include         system-auth
 auth           include         system-auth
 account                include         system-auth
 session                include         system-auth

+session                required        pam_loginuid.so

diff --git a/cronie.spec b/cronie.spec
index c6afba93f06b421ece8bf2f282d310571d530eab..0807617f99add52a69d8bfa7b83b9a0561a4d0d3 100644 (file)
--- a/cronie.spec
+++ b/cronie.spec
@@ -17,7 +17,7 @@
 Summary:       Cron daemon for executing programs at set times
 Name:          cronie
 Version:       1.4.9
 Summary:       Cron daemon for executing programs at set times
 Name:          cronie
 Version:       1.4.9

-Release:       1
+Release:       2

 License:       MIT and BSD and GPL v2
 Group:         Daemons
 Source0:       https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
 License:       MIT and BSD and GPL v2
 Group:         Daemons
 Source0:       https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz


@@ -133,12 +133,19 @@ install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir},%{systemdunitd
        pamdir=/etc/pam.d \
        DESTDIR=$RPM_BUILD_ROOT
 
        pamdir=/etc/pam.d \
        DESTDIR=$RPM_BUILD_ROOT
 

+cp -p %{SOURCE5} crond.pam
+
+%if %{without audit}
+# remove recording user's login uid to the process attribute
+%{__sed} -i -e '/pam_loginuid.so/d' crond.pam
+%endif
+

 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
 cp -a contrib/0anacron $RPM_BUILD_ROOT/etc/cron.hourly/0anacron
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/cron
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/cron
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
 cp -a contrib/0anacron $RPM_BUILD_ROOT/etc/cron.hourly/0anacron
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/cron
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/cron
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab

-cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/crond
+cp -a crond.pam  $RPM_BUILD_ROOT/etc/pam.d/crond

 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/crond.conf
 cp -a %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service
 
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/crond.conf
 cp -a %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service