summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-03-01 15:27:36 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-03-01 15:27:36 -0500
commit23969f7aadf7611ed73d300b23c8fbfca91cb66a (patch)
treee63b90db90b9ccedeca9934c7bd739b683351038
parentebd776722e0fd6dfacc79146c368d148f0e266cb (diff)
explicity set the USER variable, since it's needed for checking file permissions. add/modify some debug messages.
-rwxr-xr-xsrc/monkeysphere3
-rw-r--r--src/share/common14
-rw-r--r--src/share/ma/update_users1
3 files changed, 12 insertions, 6 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index 8d59d08..aa9276c 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -189,6 +189,9 @@ export GNUPGHOME
mkdir -p -m 0700 "$GNUPGHOME"
export LOG_LEVEL
+# explicitly set the USER variable, for checking file permissions
+export USER=$(whoami)
+
# get subcommand
COMMAND="$1"
[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
diff --git a/src/share/common b/src/share/common
index 1cdd549..c6d6b8e 100644
--- a/src/share/common
+++ b/src/share/common
@@ -427,13 +427,15 @@ check_key_file_permissions() {
# return 1 if path has invalid owner
if [ "$owner" != "$uname" -a "$owner" != 'root' ] ; then
- log error "improper ownership on path '$path'."
+ log error "improper ownership on path '$path':"
+ log error " $owner != ($uname|root)"
return 1
fi
# return 2 if path has group or other writability
if is_write "$gAccess" || is_write "$oAccess" ; then
- log error "improper group or other writability on path '$path'."
+ log error "improper group or other writability on path '$path':"
+ log error " group: $gAccess, other: $oAcess"
return 2
fi
@@ -667,14 +669,14 @@ process_user_id() {
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
log verbose " * acceptable primary key."
if [ -z "$sshKey" ] ; then
- log error " ! primary key could not be translated (not RSA or DSA?)."
+ log error " ! primary key could not be translated (not RSA?)."
else
echo "0:${sshKey}"
fi
else
log debug " - unacceptable primary key."
if [ -z "$sshKey" ] ; then
- log debug " ! primary key could not be translated (not RSA or DSA?)."
+ log debug " ! primary key could not be translated (not RSA?)."
else
echo "1:${sshKey}"
fi
@@ -725,14 +727,14 @@ process_user_id() {
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
log verbose " * acceptable sub key."
if [ -z "$sshKey" ] ; then
- log error " ! sub key could not be translated (not RSA or DSA?)."
+ log error " ! sub key could not be translated (not RSA?)."
else
echo "0:${sshKey}"
fi
else
log debug " - unacceptable sub key."
if [ -z "$sshKey" ] ; then
- log debug " ! sub key could not be translated (not RSA or DSA?)."
+ log debug " ! sub key could not be translated (not RSA?)."
else
echo "1:${sshKey}"
fi
diff --git a/src/share/ma/update_users b/src/share/ma/update_users
index 3a5c006..195e982 100644
--- a/src/share/ma/update_users
+++ b/src/share/ma/update_users
@@ -88,6 +88,7 @@ for uname in $unames ; do
cat "$authorizedUserIDs" > "$TMP_AUTHORIZED_USER_IDS"
# export needed variables
+ export USER="$uname"
export AUTHORIZED_KEYS
export TMP_AUTHORIZED_USER_IDS