projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jrollins/master'
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index dd5dc162a31f4183374237d018baf1d5dcada1d4..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") || \
@@
-846,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
"$FILE_OWNER"
"$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"
@@
-1000,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
"$FILE_OWNER"
"$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"
@@
-1076,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
"$FILE_OWNER"
"$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."