[28816] in Source-Commits

home help back first fref pref prev next nref lref last post

pam-config commit: Remove the admin group from the default access.conf

daemon@ATHENA.MIT.EDU (Lizhou Sha)
Sun Nov 12 03:26:56 2017

Date: Sun, 12 Nov 2017 03:26:40 -0500
From: Lizhou Sha <slz@mit.edu>
Message-Id: <201711120826.vAC8QeUT012604@drugstore.mit.edu>
To: source-commits@mit.edu

https://github.com/mit-athena/pam-config/commit/de31b6ede9fa9018e6dbfd1bc045774c0685012c
commit de31b6ede9fa9018e6dbfd1bc045774c0685012c
Author: Anders Kaseorg <andersk@mit.edu>
Date:   Sat Nov 11 21:59:12 2017 -0500

    Remove the admin group from the default access.conf
    
    It is no longer present on Ubuntu either.
    
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>

 debian/access.conf.append |    2 +-
 debian/changelog          |    7 +++++++
 debian/control            |    2 +-
 debian/rules              |    9 ---------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/access.conf.append b/debian/access.conf.append
index b6969c6..b6f3161 100644
--- a/debian/access.conf.append
+++ b/debian/access.conf.append
@@ -15,6 +15,6 @@
 # on the machine (i.e. are in /etc/passwd).  Allow all other users to
 # login only locally.
 
--:ALL EXCEPT root sudo admin nss-local-users:ALL EXCEPT LOCAL
+-:ALL EXCEPT root sudo nss-local-users:ALL EXCEPT LOCAL
 
 #DEBATHENA END
diff --git a/debian/changelog b/debian/changelog
index 858f834..dfc9d1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-pam-config (1.27) UNRELEASED; urgency=medium
+
+  * Remove the admin group from the default access.conf, as it is no
+    longer present on Ubuntu either.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sat, 11 Nov 2017 21:58:08 -0500
+
 debathena-pam-config (1.26) unstable; urgency=medium
 
   [Jacob Morzinski]
diff --git a/debian/control b/debian/control
index 30dfe6b..9978824 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-pam-config
 Section: debathena-config/net
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, config-package-dev (>= 5.0~), libpam-runtime, gdm3 | gdm, openssh-server (>= 1:4.3) | ssh-krb5, lsb-release
+Build-Depends: cdbs, debhelper, config-package-dev (>= 5.0~), libpam-runtime, gdm3 | gdm, openssh-server (>= 1:4.3) | ssh-krb5
 Standards-Version: 3.9.3
 
 Package: debathena-pam-config
diff --git a/debian/rules b/debian/rules
index 760b792..0f127fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,17 +95,8 @@ endif
 
 common-build-indep:: debian/access.conf.debathena
 
-LSB_ID = $(shell lsb_release --short --id)
 debian/access.conf.debathena: $(call debian_check_files,/etc/security/access.conf)
-ifeq ($(LSB_ID), Debian)
-	(cat $<; sed 's/root admin /root /' debian/access.conf.append) > $@
-else
-    ifeq ($(LSB_ID), Ubuntu)
 	cat $< debian/access.conf.append > $@
-    else
-	$(error Unrecognized distribution ID $(LSB_ID).)
-    endif
-endif
 
 clean::
 	rm -f debian/access.conf.debathena

home help back first fref pref prev next nref lref last post