From: Jameson Rollins <jrollins@finestructure.net>
Date: Mon, 4 Oct 2010 04:37:29 +0000 (-0400)
Subject: fix need for only single argument to gpg_sphere
X-Git-Tag: monkeysphere_0.32-1~2^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=90166e0bb8e4ebc1c1174d9bc2021c604b7a1bd7;p=monkeysphere.git

fix need for only single argument to gpg_sphere

The use of $* instead of $@ in the call to su_monkeysphere_user is
what we want to not split the input to the bash subcalls into separate
words.
---

diff --git a/Changelog b/Changelog
index fdfc10b..27a5328 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,8 @@ monkeysphere (0.32~pre) unstable; urgency=low
   [ Jameson Rollins ]
   * Fix specification of install paths in all scripts and man pages
     (closes MS #2491)
+  * Fix need for single argument to gpg_sphere (thanks Clint)
+    (closes MS #442)
 
   [ Micah Anderson ]
   * fix monkeysphere-host revoke-key, which never worked properly :(
@@ -15,8 +17,7 @@ monkeysphere (0.32~pre) unstable; urgency=low
     whitespace-prefixed lines immediately following that User ID. 
     (closes MS #440)
 
- -- Jameson Rollins <jrollins@finestructure.net>  Sun, 03 Oct 2010 00:23:08 -0400
-
+ -- Jameson Rollins <jrollins@finestructure.net>  Mon, 04 Oct 2010 00:36:08 -0400
 
 monkeysphere (0.31) unstable; urgency=low
 
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index c924034..94642b6 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -77,8 +77,6 @@ gpg_core() {
 }
 
 # function to interact with the gpg sphere keyring
-# FIXME: this function requires only a single argument because of
-# problems with quote expansion.  this needs to be fixed/improved.
 gpg_sphere() {
     GNUPGHOME="$GNUPGHOME_SPHERE"
     export GNUPGHOME
@@ -99,7 +97,7 @@ core_fingerprint() {
 gpg_core_sphere_sig_transfer() {
     log debug "exporting core local sigs to sphere..."
     gpg_core --export-options export-local-sigs --export | \
-	gpg_sphere "--import-options import-local-sigs --import" 2>&1 | log debug
+	gpg_sphere --import-options import-local-sigs --import 2>&1 | log debug
 }
 
 ########################################################################
@@ -172,7 +170,7 @@ case $COMMAND in
     'refresh-keys'|'refresh'|'r')
 	source "${MASHAREDIR}/setup"
 	setup
-	gpg_sphere "--keyserver $KEYSERVER --refresh-keys"
+	gpg_sphere --keyserver "$KEYSERVER" --refresh-keys
 	;;
 
     'keys-for-user')
diff --git a/src/share/common b/src/share/common
index 50c9f61..34ac52d 100644
--- a/src/share/common
+++ b/src/share/common
@@ -103,12 +103,12 @@ su_monkeysphere_user() {
     case $(id -un) in
 	# if monkeysphere user, run the command under bash
 	"$MONKEYSPHERE_USER")
-	    bash -c "$@"
+	    bash -c "$*"
 	    ;;
 
          # if root, su command as monkeysphere user
 	'root')
-	    su "$MONKEYSPHERE_USER" -c "$@"
+	    su "$MONKEYSPHERE_USER" -c "$*"
 	    ;;
 
 	# otherwise, fail