projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clarified content/licensing on main page of web site.
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index 1cdd54943d2909f9aaee7a87a33cf6d18e21e7c8..ea872ba17abe39ec1a8a721876b6bf74d42ab069 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-76,11
+76,10
@@
log() {
fi
if [ "$priority" = "$level" -a "$output" = 'true' ] ; then
if [ "$1" ] ; then
fi
if [ "$priority" = "$level" -a "$output" = 'true' ] ; then
if [ "$1" ] ; then
- echo -n "ms: " >&2
- echo "$@" >&2
+ echo "$@"
else
else
- cat
>&2
- fi
+ cat
+ fi
| sed 's/^/'"${LOG_PREFIX}"'/' >&2
fi
done
}
fi
done
}
@@
-354,12
+353,15
@@
remove_monkeysphere_lines() {
file="$1"
file="$1"
- if [ -z "$file" ] ; then
+ # return error if file does not exist
+ if [ ! -e "$file" ] ; then
return 1
fi
return 1
fi
- if [ ! -e "$file" ] ; then
- return 1
+ # just return ok if the file is empty, since there aren't any
+ # lines to remove
+ if [ ! -s "$file" ] ; then
+ return 0
fi
tempfile=$(mktemp "${file}.XXXXXXX") || \
fi
tempfile=$(mktemp "${file}.XXXXXXX") || \
@@
-427,13
+429,15
@@
check_key_file_permissions() {
# return 1 if path has invalid owner
if [ "$owner" != "$uname" -a "$owner" != 'root' ] ; then
# 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
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
return 2
fi
@@
-667,14
+671,14
@@
process_user_id() {
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
log verbose " * acceptable primary key."
if [ -z "$sshKey" ] ; then
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
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
else
echo "1:${sshKey}"
fi
@@
-725,14
+729,14
@@
process_user_id() {
if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
log verbose " * acceptable sub key."
if [ -z "$sshKey" ] ; then
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
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
else
echo "1:${sshKey}"
fi
@@
-844,7
+848,7
@@
update_known_hosts() {
(umask 0022 && touch "$KNOWN_HOSTS")
# check permissions on the known_hosts file path
(umask 0022 && touch "$KNOWN_HOSTS")
# check permissions on the known_hosts file path
- check_key_file_permissions
"$USER"
"$KNOWN_HOSTS" || failure
+ check_key_file_permissions
$(whoami)
"$KNOWN_HOSTS" || failure
# create a lockfile on known_hosts:
lock create "$KNOWN_HOSTS"
# create a lockfile on known_hosts:
lock create "$KNOWN_HOSTS"
@@
-998,7
+1002,7
@@
update_authorized_keys() {
log debug " $AUTHORIZED_KEYS"
# check permissions on the authorized_keys file path
log debug " $AUTHORIZED_KEYS"
# check permissions on the authorized_keys file path
- check_key_file_permissions
"$USER"
"$AUTHORIZED_KEYS" || failure
+ check_key_file_permissions
$(whoami)
"$AUTHORIZED_KEYS" || failure
# create a lockfile on authorized_keys
lock create "$AUTHORIZED_KEYS"
# create a lockfile on authorized_keys
lock create "$AUTHORIZED_KEYS"
@@
-1074,7
+1078,7
@@
process_authorized_user_ids() {
log debug " $authorizedUserIDs"
# check permissions on the authorized_user_ids file path
log debug " $authorizedUserIDs"
# check permissions on the authorized_user_ids file path
- check_key_file_permissions
"$USER"
"$authorizedUserIDs" || failure
+ check_key_file_permissions
$(whoami)
"$authorizedUserIDs" || failure
if ! meat "$authorizedUserIDs" > /dev/null ; then
log debug " no user IDs to process."
if ! meat "$authorizedUserIDs" > /dev/null ; then
log debug " no user IDs to process."