summaryrefslogtreecommitdiff
path: root/src/monkeysphere-authentication
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-10-04 00:37:29 -0400
committerJameson Rollins <jrollins@finestructure.net>2010-10-04 00:37:29 -0400
commit90166e0bb8e4ebc1c1174d9bc2021c604b7a1bd7 (patch)
treef5368fc4429334891e1d3dcd849be62439b205d7 /src/monkeysphere-authentication
parent96dcef5bcdbb90745f2595f5734b9a7d3742878f (diff)
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.
Diffstat (limited to 'src/monkeysphere-authentication')
-rwxr-xr-xsrc/monkeysphere-authentication6
1 files changed, 2 insertions, 4 deletions
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')