summaryrefslogtreecommitdiff
path: root/src/share/common
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 /src/share/common
parentebd776722e0fd6dfacc79146c368d148f0e266cb (diff)
explicity set the USER variable, since it's needed for checking file permissions. add/modify some debug messages.
Diffstat (limited to 'src/share/common')
-rw-r--r--src/share/common14
1 files changed, 8 insertions, 6 deletions
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