Save all parameters into a file instead of one file per param.

This closes a security hole noticed by mbiebl.

1 files changed, 10 insertions, 14 deletions

diff --git a/pm/functions.in b/pm/functions.in
index e4dd63f..073d79a 100644
--- a/pm/functions.in
+++ b/pm/functions.in
@@ -190,34 +190,30 @@ restorestate()
 }
 
 # If we were told by the user to ignore some parameters from HAL.
-# remove them from our list.  This implementation is rather stupid.
+# remove parameters from our list
 remove_parameters() {
-	local x y
+	local p
 	if [ "$1" = "all" ]; then
-	    for p in "${STORAGEDIR}/parm:"*; do 
-		[ -O "$p" ] && rm -f "$p"; 
-	    done
+	    echo '' > "$NEW_PARAMETERS"
 	else
+	    [ -f "$PARAMETERS.rm" ] && rm "$PARAMETERS.rm"
 	    for p in "$@"; do
-		[ -O "${STORAGEDIR}/parm:$p" ] && \
-		    rm "${STORAGEDIR}/parm:$p"
+		echo "$p" >> "$PARAMETERS.rm"
 	    done
+	    # let grep do the dirty work.
+	    grep -vxFf "$PARAMETERS.rm" "$PARAMETERS" > "$NEW_PARAMETERS"
 	fi
-	touch "${STORAGEDIR}/new-parm"
 }
 
 # Add a parameter to our commandline parameters. 
 add_parameters() {
+	remove_parameters "$@" # no dups, please.
 	for x in "$@"; do
-	    touch "${STORAGEDIR}/parm:${x}"
+	    echo "$x" >"$NEW_PARAMETERS"
 	done
-	# update for next hook.
-	touch "${STORAGEDIR}/new-parm"
 }
 
 # Remove a parameter from our commandline parameters.  
 get_parameters() {
-	for x in "${STORAGEDIR}/parm:"*; do
-	    [ -O "$x" ] && echo "${x##*:}"
-	done
+	cat "$PARAMETERS"
 }