[24397] in Source-Commits
/svn/athena r23992 - in trunk/debathena/config: libpam-krb5-config/debian pam-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Fri Sep 4 14:53:24 2009
Date: Fri, 4 Sep 2009 14:53:07 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200909041853.n84Ir7Q9001147@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-09-04 14:53:06 -0400 (Fri, 04 Sep 2009)
New Revision: 23992
Added:
trunk/debathena/config/pam-config/debian/issue.net.no_network
Modified:
trunk/debathena/config/libpam-krb5-config/debian/changelog
trunk/debathena/config/libpam-krb5-config/debian/control.in
trunk/debathena/config/libpam-krb5-config/debian/libpam-krb5-config.pam-config
trunk/debathena/config/pam-config/debian/changelog
trunk/debathena/config/pam-config/debian/debathena-pam-config.install
trunk/debathena/config/pam-config/debian/transform_common-auth.debathena
Log:
In libpam-krb5-config:
* Configure the Kerberos authentication to print an error message if
pam_krb5 can't reach the KDC. (Trac: #208)
In pam-config:
* Configure the Kerberos authentication to print an error message if
pam_krb5 can't reach the KDC. (Trac: #208)
Modified: trunk/debathena/config/libpam-krb5-config/debian/changelog
===================================================================
--- trunk/debathena/config/libpam-krb5-config/debian/changelog 2009-09-04 13:37:28 UTC (rev 23991)
+++ trunk/debathena/config/libpam-krb5-config/debian/changelog 2009-09-04 18:53:06 UTC (rev 23992)
@@ -1,3 +1,10 @@
+libpam-krb5-config (0.0.8) unstable; urgency=low
+
+ * Configure the Kerberos authentication to print an error message if
+ pam_krb5 can't reach the KDC. (Trac: #208)
+
+ -- Evan Broder <broder@mit.edu> Fri, 04 Sep 2009 14:47:14 -0400
+
libpam-krb5-config (0.0.7) unstable; urgency=low
* Don't accept root's Kerberos password, only the local root password.
Modified: trunk/debathena/config/libpam-krb5-config/debian/control.in
===================================================================
--- trunk/debathena/config/libpam-krb5-config/debian/control.in 2009-09-04 13:37:28 UTC (rev 23991)
+++ trunk/debathena/config/libpam-krb5-config/debian/control.in 2009-09-04 18:53:06 UTC (rev 23992)
@@ -7,7 +7,7 @@
Package: libpam-krb5-config
Architecture: all
-Depends: libpam-krb5, libpam-runtime (>= 1.0.1-4ubuntu1), ${misc:Depends}
+Depends: libpam-krb5, libpam-runtime (>= 1.0.1-4ubuntu1), debathena-pam-config (>= 1.16), ${misc:Depends}
Description: Configure PAM to enable libpam-krb5
Enables libpam-krb5, using the pam-auth-update mechanism
to do so cleanly.
Modified: trunk/debathena/config/libpam-krb5-config/debian/libpam-krb5-config.pam-config
===================================================================
--- trunk/debathena/config/libpam-krb5-config/debian/libpam-krb5-config.pam-config 2009-09-04 13:37:28 UTC (rev 23991)
+++ trunk/debathena/config/libpam-krb5-config/debian/libpam-krb5-config.pam-config 2009-09-04 18:53:06 UTC (rev 23992)
@@ -3,9 +3,11 @@
Priority: 128
Auth-Type: Primary
Auth-Initial:
- [success=end default=ignore] pam_krb5.so minimum_uid=1
+ [success=end authinfo_unavail=ignore default=1] pam_krb5.so minimum_uid=1
+ [default=die] pam_echo.so file=/etc/issue.net.no_network
Auth:
- [success=end default=ignore] pam_krb5.so minimum_uid=1 use_first_pass
+ [success=end authinfo_unavail=ignore default=1] pam_krb5.so minimum_uid=1 use_first_pass
+ [default=die] pam_echo.so file=/etc/issue.net.no_network
Account-Type: Primary
Account:
[success=end default=ignore] pam_krb5.so minimum_uid=1
Modified: trunk/debathena/config/pam-config/debian/changelog
===================================================================
--- trunk/debathena/config/pam-config/debian/changelog 2009-09-04 13:37:28 UTC (rev 23991)
+++ trunk/debathena/config/pam-config/debian/changelog 2009-09-04 18:53:06 UTC (rev 23992)
@@ -1,3 +1,10 @@
+debathena-pam-config (1.16) unstable; urgency=low
+
+ * Configure the Kerberos authentication to print an error message if
+ pam_krb5 can't reach the KDC. (Trac: #208)
+
+ -- Evan Broder <broder@mit.edu> Fri, 04 Sep 2009 14:45:26 -0400
+
debathena-pam-config (1.15) unstable; urgency=low
* Don't accept root's Kerberos password, only the local root password.
Modified: trunk/debathena/config/pam-config/debian/debathena-pam-config.install
===================================================================
--- trunk/debathena/config/pam-config/debian/debathena-pam-config.install 2009-09-04 13:37:28 UTC (rev 23991)
+++ trunk/debathena/config/pam-config/debian/debathena-pam-config.install 2009-09-04 18:53:06 UTC (rev 23992)
@@ -1 +1,2 @@
debian/access.conf.debathena etc/security
+debian/issue.net.no_network etc
Added: trunk/debathena/config/pam-config/debian/issue.net.no_network
===================================================================
--- trunk/debathena/config/pam-config/debian/issue.net.no_network 2009-09-04 13:37:28 UTC (rev 23991)
+++ trunk/debathena/config/pam-config/debian/issue.net.no_network 2009-09-04 18:53:06 UTC (rev 23992)
@@ -0,0 +1,2 @@
+Cannot contact the Athena login servers. Please check your network
+connection and try again.
Modified: trunk/debathena/config/pam-config/debian/transform_common-auth.debathena
===================================================================
--- trunk/debathena/config/pam-config/debian/transform_common-auth.debathena 2009-09-04 13:37:28 UTC (rev 23991)
+++ trunk/debathena/config/pam-config/debian/transform_common-auth.debathena 2009-09-04 18:53:06 UTC (rev 23992)
@@ -1,2 +1,2 @@
#!/usr/bin/perl -0p
-s/^(auth[ \t]+)(required|requisite)( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$1sufficient$4$5\n$1required$3$4pam_krb5.so minimum_uid=1 use_first_pass\n/m or die;
+s/^(auth[ \t]+)(required|requisite)( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$1sufficient$4$5\n$1\[success=done authinfo_unavail=ignore default=die\]$3$4pam_krb5.so minimum_uid=1 use_first_pass\n$1\[default=die\]$3$4pam_echo.so file=\/etc\/issue.net.no_network\n/m or die;
