packages: rc-scripts-user/rc-scripts-user.spec, rc-scripts-user/userscripts...

sparky sparky at pld-linux.org
Tue Feb 1 10:32:33 CET 2011


Author: sparky                       Date: Tue Feb  1 09:32:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to: 1.7
-- use getent passwd to grab all users, not only local ones (thx glen, arekm)
-- force /bin/sh in su wrepper to make sure quoting works as we expect it

---- Files affected:
packages/rc-scripts-user:
   rc-scripts-user.spec (1.8 -> 1.9) , userscripts.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/rc-scripts-user/rc-scripts-user.spec
diff -u packages/rc-scripts-user/rc-scripts-user.spec:1.8 packages/rc-scripts-user/rc-scripts-user.spec:1.9
--- packages/rc-scripts-user/rc-scripts-user.spec:1.8	Tue Feb  1 02:09:14 2011
+++ packages/rc-scripts-user/rc-scripts-user.spec	Tue Feb  1 10:32:28 2011
@@ -3,7 +3,7 @@
 Summary:	Run user scripts
 Summary(pl.UTF-8):	Uruchom skrypty użytkownika
 Name:		rc-scripts-user
-Version:	1.6
+Version:	1.7
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
@@ -86,6 +86,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/02/01 09:32:28  sparky
+- updated to: 1.7
+-- use getent passwd to grab all users, not only local ones (thx glen, arekm)
+-- force /bin/sh in su wrepper to make sure quoting works as we expect it
+
 Revision 1.8  2011/02/01 01:09:14  sparky
 - updated to: 1.6
 -- implemented script limit (by default only 20 scripts for each user)

================================================================
Index: packages/rc-scripts-user/userscripts.init
diff -u packages/rc-scripts-user/userscripts.init:1.6 packages/rc-scripts-user/userscripts.init:1.7
--- packages/rc-scripts-user/userscripts.init:1.6	Tue Feb  1 02:09:14 2011
+++ packages/rc-scripts-user/userscripts.init	Tue Feb  1 10:32:28 2011
@@ -70,7 +70,7 @@
 
 	SCRIPTS_RUN=0
 	local IFS=":"
-	while read user pass uid gid name home shell; do
+	getent passwd | while read user pass uid gid name home shell; do
 		[ -d "$home/$scripts_dir" ] || continue
 
 		if ! is_allowed "$user" "$shell"; then
@@ -101,7 +101,7 @@
 				continue
 			fi
 
-			su - "$user" -c "exec /sbin/run-fast-or-hide -n '$NICE' $RUN_ARGS -- '$script' '$action'"
+			su - "$user" -s /bin/sh -c "exec /sbin/run-fast-or-hide -n '$NICE' $RUN_ARGS -- '$script' '$action'"
 			local RET=$?
 			deltext
 			if [ $RET -eq 250 ]; then
@@ -111,7 +111,7 @@
 				[ $RET -eq 0 ] && ok || fail
 			fi
 		done
-	done < /etc/passwd
+	done
 }
 
 start()
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts-user/rc-scripts-user.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts-user/userscripts.init?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list