From e02c127f8e2c5001cf90429a2ee3532d7a4e3c76 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 9 Feb 2013 19:54:08 +0100
Subject: Simplify arguments passed to su_monkeysphere_user() and gpg_sphere
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is a healthy coding practice to keep each argument separate when
executing system calls, i.e. quote each variable separately instead of
relying on whitespace to indicate argument separation.

This patch improves argument passing like this:

  a) Each argument is passed individually (not all as a single string)
  b) Arguments containing no variables are not quoted
  c) Dynamic arguments are double-quoted ( "$@" )

Due to su_monkeysphere_user() expanding arguments using "$*" (not "$@")
arguments are mostly¹ coollapsed into single strings, and this change is
therefore only cosmetic.

It does improve clarity, however.  Also, it eases switching to safer
quoted arguments in the future.

¹As sole excepion ma/update_users line 82 has $STRICT_MODES dual-quoted.
---
 src/share/ma/add_certifier | 2 +-
 src/share/ma/setup         | 4 ++--
 src/share/ma/update_users  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/share/ma')

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index de8b1d1..d456763 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
     # check the key is ok as monkeysphere user before loading
     log debug "checking keys in file..."
     fingerprint=$(su_monkeysphere_user \
-	". ${SYSSHAREDIR}/list_primary_fingerprints" < "$keyID")
+	. "${SYSSHAREDIR}/list_primary_fingerprints" < "$keyID")
 
     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
 	failure "There was not exactly one gpg key in the file."
diff --git a/src/share/ma/setup b/src/share/ma/setup
index e65f875..6745da7 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -99,7 +99,7 @@ EOF
     # check the owner trust
     log debug "checking gpg_sphere owner trust set properly..."
     local ORIG_TRUST
-    if ORIG_TRUST=$(gpg_sphere "--export-ownertrust" | grep '^[^#]') ; then
+    if ORIG_TRUST=$(gpg_sphere --export-ownertrust | grep '^[^#]') ; then
 	if [ "${CORE_FPR}:6:" != "$ORIG_TRUST" ] ; then
 	    failure "Monkeysphere authentication trust sphere should explicitly trust the core.  It does not have proper ownertrust settings."
 	fi
@@ -112,7 +112,7 @@ EOF
     # our preferences are reasonable (i.e. 3 marginal OR 1 fully
     # trusted certifications are sufficient to grant full validity.
     log debug "checking trust model for authentication ..."
-    local TRUST_MODEL=$(gpg_sphere "--with-colons --list-keys" 2>/dev/null \
+    local TRUST_MODEL=$(gpg_sphere --with-colons --list-keys 2>/dev/null \
 	| head -n1 | grep "^tru:" | cut -d: -f3,6,7)
     log debug "sphere trust model: $TRUST_MODEL"
     if [ "$TRUST_MODEL" != '1:3:1' ] ; then
diff --git a/src/share/ma/update_users b/src/share/ma/update_users
index 1330c8d..991c302 100644
--- a/src/share/ma/update_users
+++ b/src/share/ma/update_users
@@ -79,7 +79,7 @@ for uname in $unames ; do
 
 	    # process authorized_user_ids file, as monkeysphere user
 	    su_monkeysphere_user \
-		". ${SYSSHAREDIR}/process_authorized_user_ids '$STRICT_MODES' -" \
+		. "${SYSSHAREDIR}/process_authorized_user_ids" "'$STRICT_MODES'" - \
 		< "$authorizedUserIDs" \
 		> "$tmpAuthorizedKeys"
 
-- 
cgit v1.2.3