diff options
Diffstat (limited to 'src/share/ma')
| -rw-r--r-- | src/share/ma/add_certifier | 10 | ||||
| -rw-r--r-- | src/share/ma/remove_certifier | 2 | ||||
| -rw-r--r-- | src/share/ma/update_users | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier index d456763..3acfd34 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." @@ -114,12 +114,12 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then # else, get the key from the keyserver else log verbose "searching keyserver $KEYSERVER for keyID $keyID..." - gpg_sphere --keyserver "$KEYSERVER" --recv-key "0x${keyID}!" \ + gpg_sphere --keyserver "'$KEYSERVER'" --recv-key "'0x${keyID}!'" \ || failure "Could not receive a key with this ID from the '$KEYSERVER' keyserver." # get the full fingerprint of new certifier key log debug "getting fingerprint of certifier key..." - fingerprint=$(gpg_sphere --list-key --with-colons --with-fingerprint "0x${keyID}!" \ + fingerprint=$(gpg_sphere --list-key --with-colons --with-fingerprint "'0x${keyID}!'" \ | grep '^fpr:' | cut -d: -f10) # test that there is only a single fingerprint @@ -133,7 +133,7 @@ EOF fi log info "key found:" - gpg_sphere --fingerprint "0x${fingerprint}!" + gpg_sphere --fingerprint "'0x${fingerprint}!'" if [ "$PROMPT" != "false" ] ; then printf "Are you sure you want to add the above key as a certifier\nof users on this system? (Y/n) " >&2 @@ -149,7 +149,7 @@ fi # export the key to the core keyring so that the core can sign the # new certifier key log debug "loading key into core keyring..." -gpg_sphere --export "0x${fingerprint}!" | gpg_core --import +gpg_sphere --export "'0x${fingerprint}!'" | gpg_core --import # edit-key script to ltsign key # NOTE: *all* user IDs will be ltsigned diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier index 9f5be25..6ec9a2d 100644 --- a/src/share/ma/remove_certifier +++ b/src/share/ma/remove_certifier @@ -37,7 +37,7 @@ else fi # delete the requested key from the sphere keyring -if gpg_sphere --delete-key --batch --yes "0x${keyID}!" ; then +if gpg_sphere --delete-key --batch --yes "'0x${keyID}!'" ; then # delete key from core keyring as well gpg_core --delete-key --batch --yes "0x${keyID}!" diff --git a/src/share/ma/update_users b/src/share/ma/update_users index 991c302..09ca9cb 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" |