summaryrefslogtreecommitdiff
path: root/src/monkeysphere-server
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-06-23 19:02:58 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-06-23 19:02:58 -0400
commit438d1fa8881a1f8359b5e91932bf42addefbffca (patch)
tree98b950edf82c9080bbc964b7c777e13befba3a7d /src/monkeysphere-server
parent1accfecc11da106d6626dc620ee5182d5a66f4f5 (diff)
switched shortcut for monkeysphere-server update-users to "u", added some FIXMEs to monkeysphere-server.
Diffstat (limited to 'src/monkeysphere-server')
-rwxr-xr-xsrc/monkeysphere-server9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index b989816..11e593b 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -171,7 +171,7 @@ mkdir -p -m 0700 "$GNUPGHOME"
mkdir -p "${CACHE}/authorized_keys"
case $COMMAND in
- 'update-users'|'update-user'|'s')
+ 'update-users'|'update-user'|'u')
if [ "$1" ] ; then
# get users from command line
unames="$@"
@@ -196,6 +196,9 @@ case $COMMAND in
# skip user if authorized_user_ids file does not exist
if [ ! -f "$authorizedUserIDs" ] ; then
+ #FIXME: what about a user with no authorized_user_ids
+ # file, but with an authorized_keys file when
+ # USER_CONTROLLED_AUTHORIZED_KEYS is set?
continue
fi
@@ -207,6 +210,10 @@ case $COMMAND in
# skip if the user's authorized_user_ids file is empty
if [ ! -s "$authorizedUserIDs" ] ; then
log "authorized_user_ids file '$authorizedUserIDs' is empty."
+ #FIXME: what about a user with an empty
+ # authorized_user_ids file, but with an
+ # authorized_keys file when
+ # USER_CONTROLLED_AUTHORIZED_KEYS is set?
continue
fi