projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix CHECK_KEYSERVER variable in monkeysphere, so the default is correct for proxycomm...
[monkeysphere.git]
/
src
/
monkeysphere
diff --git
a/src/monkeysphere
b/src/monkeysphere
index a626a8e41752797deb8542eff73ff5df69019cd3..992ca063ab475f5a554db0c09f787941f8807c34 100755
(executable)
--- a/
src/monkeysphere
+++ b/
src/monkeysphere
@@
-69,6
+69,10
@@
KNOWN_HOSTS="${HOME}/.ssh/known_hosts"
HASH_KNOWN_HOSTS="true"
AUTHORIZED_KEYS="${HOME}/.ssh/authorized_keys"
HASH_KNOWN_HOSTS="true"
AUTHORIZED_KEYS="${HOME}/.ssh/authorized_keys"
+# unset the check keyserver variable, since that needs to have
+# different defaults for the different functions
+unset CHECK_KEYSERVER
+
# load global config
[ -r "${SYSCONFIGDIR}/monkeysphere.conf" ] \
&& . "${SYSCONFIGDIR}/monkeysphere.conf"
# load global config
[ -r "${SYSCONFIGDIR}/monkeysphere.conf" ] \
&& . "${SYSCONFIGDIR}/monkeysphere.conf"
@@
-115,7
+119,7
@@
shift
case $COMMAND in
'update-known_hosts'|'update-known-hosts'|'k')
# whether or not to check keyservers
case $COMMAND in
'update-known_hosts'|'update-known-hosts'|'k')
# whether or not to check keyservers
- CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$
CHECK_KEYSERVER
}
+ CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$
{CHECK_KEYSERVER:="true"}
}
# if hosts are specified on the command line, process just
# those hosts
# if hosts are specified on the command line, process just
# those hosts
@@
-133,7
+137,7
@@
case $COMMAND in
'update-authorized_keys'|'update-authorized-keys'|'a')
# whether or not to check keyservers
'update-authorized_keys'|'update-authorized-keys'|'a')
# whether or not to check keyservers
- CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$
CHECK_KEYSERVER
}
+ CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$
{CHECK_KEYSERVER:="true"}
}
# process authorized_user_ids file
process_authorized_user_ids "$AUTHORIZED_USER_IDS"
# process authorized_user_ids file
process_authorized_user_ids "$AUTHORIZED_USER_IDS"