summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/monkeysphere8
-rwxr-xr-xsrc/monkeysphere-host3
-rw-r--r--src/share/m/ssh_proxycommand1
3 files changed, 8 insertions, 4 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index a626a8e..992ca06 100755
--- 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"
+# 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"
@@ -115,7 +119,7 @@ shift
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
@@ -133,7 +137,7 @@ case $COMMAND in
'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"
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 9e73ad2..00f7c34 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -110,7 +110,7 @@ load_fingerprint() {
&& rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
| grep '^fpr:' | cut -d: -f10 )
else
- HOST_FINGERPRINT=
+ failure "host key gpg pub file not found."
fi
}
@@ -293,6 +293,7 @@ case $COMMAND in
;;
'update-gpg-pub-file')
+ load_fingerprint_secret
update_gpg_pub_file
;;
diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
index 29040d8..d7e801e 100644
--- a/src/share/m/ssh_proxycommand
+++ b/src/share/m/ssh_proxycommand
@@ -200,7 +200,6 @@ fi
CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$CHECK_KEYSERVER}
# update the known_hosts file for the host
-source "${MSHAREDIR}/update_known_hosts"
update_known_hosts "$HOSTP"
# output on depending on the return of the update-known_hosts