summaryrefslogtreecommitdiff
path: root/src/share/ma
diff options
context:
space:
mode:
Diffstat (limited to 'src/share/ma')
-rw-r--r--src/share/ma/add_certifier2
-rw-r--r--src/share/ma/setup4
-rw-r--r--src/share/ma/update_users2
3 files changed, 4 insertions, 4 deletions
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"