rpms/vlock/devel vlock-1.3-morepam.patch, NONE, 1.1 vlock.spec, 1.13, 1.14
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 3 07:37:12 UTC 2005
Author: kzak
Update of /cvs/dist/rpms/vlock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20039
Modified Files:
vlock.spec
Added Files:
vlock-1.3-morepam.patch
Log Message:
more PAM patch
vlock-1.3-morepam.patch:
input.c | 9 +++++++++
1 files changed, 9 insertions(+)
--- NEW FILE vlock-1.3-morepam.patch ---
Check that the user is allowed to unlock the screen at this time. Mmmm, yeah.
Attempt to reinitialize credentials, as xscreensaver does.
--- vlock-1.3/input.c 2005-08-02 20:23:06.206463656 -0400
+++ vlock-1.3/input.c 2005-08-02 20:23:00.557322456 -0400
@@ -104,6 +104,12 @@
pam_error = pam_set_item(pamh, PAM_USER_PROMPT, strdup(prompt));
PAM_BAIL;
pam_error = pam_authenticate(pamh, 0);
+ if (pam_error == PAM_SUCCESS) {
+ pam_error = pam_acct_mgmt(pamh, 0);
+ }
+ if (pam_error == PAM_SUCCESS) {
+ pam_setcred(pamh, PAM_REINITIALIZE_CRED);
+ }
/* fix signals that may have been disordered by pam */
set_signal_mask(0);
#ifdef NO_ROOT_PASS
@@ -117,6 +123,9 @@
pam_error = pam_set_item(pamh, PAM_USER, "root");
PAM_BAIL;
pam_error = pam_authenticate(pamh, 0);
+ if (pam_error == PAM_SUCCESS) {
+ pam_error = pam_acct_mgmt(pamh, 0);
+ }
/* fix signals that may have been disordered by pam */
set_signal_mask(0);
PAM_BAIL;
Index: vlock.spec
===================================================================
RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vlock.spec 10 May 2005 11:39:33 -0000 1.13
+++ vlock.spec 3 Aug 2005 07:37:10 -0000 1.14
@@ -1,12 +1,13 @@
Summary: A program which locks one or more virtual consoles.
Name: vlock
Version: 1.3
-Release: 19
+Release: 20
License: GPL
Group: Applications/System
Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz
Patch0: vlock-1.3-system-auth.patch
Patch1: vlock-1.3-multilib-pam.patch
+Patch2: vlock-1.3-morepam.patch
Requires: pam >= 0.59, /etc/pam.d/system-auth
Buildrequires: pam-devel
BuildRoot: %{_tmppath}/vlock
@@ -21,7 +22,39 @@
Install vlock if you need to disable access to one console or to all
virtual consoles.
+%prep
+%setup -q
+%patch0 -p1 -b .system-auth
+%patch1 -p1 -b .multilib-pam
+%patch2 -p1 -b .morepam
+
+%build
+make RPM_OPT_FLAGS="${RPM_OPT_FLAGS}"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+install -m 755 vlock $RPM_BUILD_ROOT%{_bindir}/
+install -m 644 vlock.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -m 644 vlock.pamd $RPM_BUILD_ROOT/etc/pam.d/vlock
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%config /etc/pam.d/vlock
+%{_bindir}/vlock
+%{_mandir}/man1/vlock.1*
+
+
%changelog
+* Wed Aug 3 2005 Karel Zak <kzak at redhat.com> 1.3-20
+- #164950 - call account management and credential reinitialization functions
+ (patch by Nalin Dahyabhai)
+
* Tue May 10 2005 Karel Zak <kzak at redhat.com> 1.3-19
- fix debuginfo
@@ -93,29 +126,3 @@
* Mon Mar 03 1997 Michael K. Johnson <johnsonm at redhat.com>
- moved from pam.conf to pam.d
-
-%prep
-%setup -q
-%patch0 -p1 -b .system-auth
-%patch1 -p1 -b .multilib-pam
-
-%build
-make RPM_OPT_FLAGS="${RPM_OPT_FLAGS}"
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-install -m 755 vlock $RPM_BUILD_ROOT%{_bindir}/
-install -m 644 vlock.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-install -m 644 vlock.pamd $RPM_BUILD_ROOT/etc/pam.d/vlock
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%config /etc/pam.d/vlock
-%{_bindir}/vlock
-%{_mandir}/man1/vlock.1*
More information about the fedora-cvs-commits
mailing list