projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix something that was resolved improperly in the previous merge.
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index 2a20c1c9311e203f0f30009da0ba91172fad1ca3..42df68494fc9911c19b06896124baf7e426b8c41 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-95,7
+95,7
@@
su_monkeysphere_user() {
# if the current user is the monkeysphere user, then just eval
# command
if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
# if the current user is the monkeysphere user, then just eval
# command
if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
-
eval
"$@"
+
bash -c
"$@"
# otherwise su command as monkeysphere user
else
# otherwise su command as monkeysphere user
else
@@
-136,6
+136,7
@@
lock() {
else
lockfile -r 20 "${file}.lock" || failure "unable to lock '$file'"
fi
else
lockfile -r 20 "${file}.lock" || failure "unable to lock '$file'"
fi
+ log debug "lock created on '$file'."
;;
touch)
if [ -n "$use_lockfileprogs" ] ; then
;;
touch)
if [ -n "$use_lockfileprogs" ] ; then
@@
-143,6
+144,7
@@
lock() {
else
: Nothing to do here
fi
else
: Nothing to do here
fi
+ log debug "lock touched on '$file'."
;;
remove)
if [ -n "$use_lockfileprogs" ] ; then
;;
remove)
if [ -n "$use_lockfileprogs" ] ; then
@@
-150,6
+152,7
@@
lock() {
else
rm -f "${file}.lock"
fi
else
rm -f "${file}.lock"
fi
+ log debug "lock removed on '$file'."
;;
*)
failure "bad argument for lock subfunction '$action'"
;;
*)
failure "bad argument for lock subfunction '$action'"
@@
-430,6
+433,8
@@
check_key_file_permissions() {
uname="$1"
path="$2"
uname="$1"
path="$2"
+ log debug "checking path permission '$path'..."
+
# return 255 if cannot stat file
if ! stat=$(ls -ld "$path" 2>/dev/null) ; then
log error "could not stat path '$path'."
# return 255 if cannot stat file
if ! stat=$(ls -ld "$path" 2>/dev/null) ; then
log error "could not stat path '$path'."
@@
-1018,6
+1023,8
@@
update_authorized_keys() {
# remove the lockfile and the trap
lock remove "$AUTHORIZED_KEYS"
# remove the lockfile and the trap
lock remove "$AUTHORIZED_KEYS"
+
+ # remove the trap
trap - EXIT
# note if the authorized_keys file was updated
trap - EXIT
# note if the authorized_keys file was updated