[Pkg-cups-devel] r612 - in cupsys/branches/cups-1.2-ubuntu: . debian

[Martin Pitt]

Author: mpitt
Date: Mon Oct 15 10:49:38 2007
New Revision: 612

Log:
* debian/cupsys.postinst: Drop ancient transitional code to remove root from
  group lpadmin. Under very odd circumstances ("root" has the same UID than
  the user) this could cause the user to be removed from group 'lpadmin'.
  Quite unlikely that this is the prime reason for LP #134503, but it's much
  cleaner in any case.

Modified:
   cupsys/branches/cups-1.2-ubuntu/   (props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Mon Oct 15 10:49:38 2007
@@ -1,3 +1,13 @@
+cupsys (1.3.2-1ubuntu7) UNRELEASED; urgency=low
+
+  * debian/cupsys.postinst: Drop ancient transitional code to remove root from
+    group lpadmin. Under very odd circumstances ("root" has the same UID than
+    the user) this could cause the user to be removed from group 'lpadmin'.
+    Quite unlikely that this is the prime reason for LP #134503, but it's much
+    cleaner in any case.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 15 Oct 2007 12:32:16 +0200
+
 cupsys (1.3.2-1ubuntu6) gutsy; urgency=low
 
   * debian/local/apparmor-profile: Allow 'm' (executable mmapping) of

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	Mon Oct 15 10:49:38 2007
@@ -39,11 +39,6 @@
 	if [ -z "`getent group lpadmin`" ]; then 
 	    addgroup --system lpadmin
 	fi
-	if [ -n "`getent group lpadmin | awk -F: '{ print $4 }' | awk -F, '{ for (i=1; i <= NF; i++ ) print $i }' |grep '^root$'`" ]; then
-	    # Bug#214746
-	    echo "Deleting root from lpadmin group. If you use NIS/LDAP, change this manually."
-	    deluser root lpadmin || true
-	fi
 
 	if [ -L /usr/share/ppd/cups-transitional-dir ]; then
 	    rm -f /usr/share/ppd/cups-transitional-dir