[26500] in Source-Commits
/svn/athena r25596 - trunk/debathena/config/pam-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Jun 30 00:14:31 2012
Date: Sat, 30 Jun 2012 00:14:29 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206300414.q5U4ETVm030682@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-30 00:14:29 -0400 (Sat, 30 Jun 2012)
New Revision: 25596
Modified:
trunk/debathena/config/pam-config/debian/transform_common-session.debathena
trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config
Log:
Use correct default/success settings to ensure test functions as an 'OR'
Modified: trunk/debathena/config/pam-config/debian/transform_common-session.debathena
===================================================================
--- trunk/debathena/config/pam-config/debian/transform_common-session.debathena 2012-06-30 04:12:29 UTC (rev 25595)
+++ trunk/debathena/config/pam-config/debian/transform_common-session.debathena 2012-06-30 04:14:29 UTC (rev 25596)
@@ -1,3 +1,3 @@
#!/usr/bin/perl -0p
-s|^(session[ \t]+)required([ \t]+)(pam_unix\.so([ \t]+.*)?)\n|$1required$2$3\n$1optional$2pam_krb5.so\n$1optional$2pam_krb524.so\n$1optional$2pam_afs_session.so aklog_homedir\n$1optional$2pam_debathena_home_type.so\n$1optional$2pam_mktemp.so var=ATHENA_SESSION_TMPDIR prefix=/var/run/athena-sessions/session dir\n$1 [default=1 success=ignore]$2pam_succeed_if.so quiet home =~ /mit/*\n$1 [default=1 success=ignore]$2pam_succeed_if.so quiet home =~ /afs/*\n$1optional$2pam_mktemp.so var=XDG_CACHE_HOME prefix=/var/run/athena-sessions/xdgcache dir\n|m or die;
+s|^(session[ \t]+)required([ \t]+)(pam_unix\.so([ \t]+.*)?)\n|$1required$2$3\n$1optional$2pam_krb5.so\n$1optional$2pam_krb524.so\n$1optional$2pam_afs_session.so aklog_homedir\n$1optional$2pam_debathena_home_type.so\n$1optional$2pam_mktemp.so var=ATHENA_SESSION_TMPDIR prefix=/var/run/athena-sessions/session dir\n$1 [default=ignore success=1]$2pam_succeed_if.so quiet home =~ /mit/*\n$1 [default=1 success=ignore]$2pam_succeed_if.so quiet home =~ /afs/*\n$1optional$2pam_mktemp.so var=XDG_CACHE_HOME prefix=/var/run/athena-sessions/xdgcache dir\n|m or die;
Modified: trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config
===================================================================
--- trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config 2012-06-30 04:12:29 UTC (rev 25595)
+++ trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config 2012-06-30 04:14:29 UTC (rev 25596)
@@ -3,6 +3,6 @@
Priority: 17
Session-Type: Additional
Session:
- [default=1 success=ignore] pam_succeed_if.so quiet home =~ /mit/*
+ [default=ignore success=1] pam_succeed_if.so quiet home =~ /mit/*
[default=1 success=ignore] pam_succeed_if.so quiet home =~ /afs/*
optional pam_mktemp.so var=XDG_CACHE_HOME prefix=/var/run/athena-sessions/xdgcache dir
