diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/share/list_primary_fingerprints | 5 | ||||
| -rw-r--r-- | src/share/ma/add_certifier | 2 | ||||
| -rw-r--r-- | src/share/ma/update_users | 2 | ||||
| -rw-r--r-- | src/share/mh/add_revoker | 2 | ||||
| -rw-r--r-- | src/share/process_authorized_user_ids | 8 |
5 files changed, 16 insertions, 3 deletions
diff --git a/src/share/list_primary_fingerprints b/src/share/list_primary_fingerprints new file mode 100644 index 0000000..17f299c --- /dev/null +++ b/src/share/list_primary_fingerprints @@ -0,0 +1,5 @@ +# -*-shell-script-*- +# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant) + +. "${SYSSHAREDIR}/common" +list_primary_fingerprints diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier index 3ce5000..de8b1d1 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}/common; 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/update_users b/src/share/ma/update_users index a70d000..1330c8d 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}/common; STRICT_MODES='$STRICT_MODES' process_authorized_user_ids -" \ + ". ${SYSSHAREDIR}/process_authorized_user_ids '$STRICT_MODES' -" \ < "$authorizedUserIDs" \ > "$tmpAuthorizedKeys" diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker index 41cf090..da6f71e 100644 --- a/src/share/mh/add_revoker +++ b/src/share/mh/add_revoker @@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then # check the key is ok as monkeysphere user before loading log debug "checking keys in file..." fingerprint=$(su_monkeysphere_user \ - ". ${SYSSHAREDIR}/common; list_primary_fingerprints" < "$revokerKeyID") + ". ${SYSSHAREDIR}/list_primary_fingerprints" < "$revokerKeyID") 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/process_authorized_user_ids b/src/share/process_authorized_user_ids new file mode 100644 index 0000000..71ea0a6 --- /dev/null +++ b/src/share/process_authorized_user_ids @@ -0,0 +1,8 @@ +# -*-shell-script-*- +# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant) + +STRICT_MODES="$1" +shift + +. "${SYSSHAREDIR}/common" +process_authorized_user_ids "$@" |