From 46f3e179ad569e247b85d86933ef1782fd1379f6 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 19 Feb 2009 03:49:23 -0500 Subject: fix CHECK_KEYSERVER variable in monkeysphere, so the default is correct for proxycommand, and fix an errant bad line in proxycommand. --- src/monkeysphere | 8 ++++++-- src/share/m/ssh_proxycommand | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') 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/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 -- cgit v1.2.3 From b38d4458903d43bd59d6dfa04c8338ef12fd9a4c Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 19 Feb 2009 03:59:09 -0500 Subject: make sure fingerprint is loaded for update_gpg_pub_file --- src/monkeysphere-host | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 ;; -- cgit v1.2.3 '>space:mode:
Diffstat (limited to 'tags/a5/c9')
-rw-r--r--tags/a5/c9/1302988479.7967.0.camel@mulgrave.site/debian0
-rw-r--r--tags/a5/c9/159508657999.27939.11554872838169019942@wilder.debian.org/debian0
-rw-r--r--tags/a5/c9/159508657999.27939.11554872838169019942@wilder.debian.org/inbox0
-rw-r--r--tags/a5/c9/159508657999.27939.11554872838169019942@wilder.debian.org/killed0
-rw-r--r--tags/a5/c9/159508657999.27939.11554872838169019942@wilder.debian.org/unread0
-rw-r--r--tags/a5/c9/17837d78a921161dd73a92ec28437763@codeaurora.org/unread0
-rw-r--r--tags/a5/c9/20031215105156.GD1665@bzz.no/debian0
-rw-r--r--tags/a5/c9/20031215105156.GD1665@bzz.no/inbox0
-rw-r--r--tags/a5/c9/20031215105156.GD1665@bzz.no/old0
-rw-r--r--tags/a5/c9/20031215105156.GD1665@bzz.no/signed0
-rw-r--r--tags/a5/c9/20170314180002.B9F205A20@lxp5.free-owl.de/sys0
-rw-r--r--tags/a5/c9/20170314180002.B9F205A20@lxp5.free-owl.de/unread0
-rw-r--r--tags/a5/c9/20180327071932.nu24dtsdy2wst2xu@an3as.eu/debian0
-rw-r--r--tags/a5/c9/20180327071932.nu24dtsdy2wst2xu@an3as.eu/unread0
-rw-r--r--tags/a5/c9/20210125144315.9375D1E8@jawa.homebase.dk/hb0
-rw-r--r--tags/a5/c9/20210125144315.9375D1E8@jawa.homebase.dk/unread0
-rw-r--r--tags/a5/c9/47C065598B03D211AA4A0000F877C582012816B7@vestmb005.slet.tdb.dk/inbox0
-rw-r--r--tags/a5/c9/47C065598B03D211AA4A0000F877C582012816B7@vestmb005.slet.tdb.dk/old0
-rw-r--r--tags/a5/c9/51814268.1010306@rabbitmq.com/inbox0
-rw-r--r--tags/a5/c9/51814268.1010306@rabbitmq.com/old0
-rw-r--r--tags/a5/c9/53E49E4C.9080904@fonfon.at/debian0
-rw-r--r--tags/a5/c9/53E49E4C.9080904@fonfon.at/unread0
-rw-r--r--tags/a5/c9/5413261C.20902@complete.org/debian0
-rw-r--r--tags/a5/c9/5413261C.20902@complete.org/unread0
-rw-r--r--tags/a5/c9/550ba723ad4f0_4c943f81c42fd2a0880f7@hookshot-fe6-cp1-prd.iad.github.net.mail/inbox0
-rw-r--r--tags/a5/c9/550ba723ad4f0_4c943f81c42fd2a0880f7@hookshot-fe6-cp1-prd.iad.github.net.mail/old0
-rw-r--r--tags/a5/c9/87pmg41qlm.fsf@hope.eyrie.org/debian0
-rw-r--r--tags/a5/c9/AANLkTi=PurALPxdyr5Yr+5bZqJ+LnyPG=J6gaCo-4D=x@mail.gmail.com/attachment0
-rw-r--r--tags/a5/c9/AANLkTi=PurALPxdyr5Yr+5bZqJ+LnyPG=J6gaCo-4D=x@mail.gmail.com/sugar0
-rw-r--r--tags/a5/c9/AANLkTi=PurALPxdyr5Yr+5bZqJ+LnyPG=J6gaCo-4D=x@mail.gmail.com/unread0
-rw-r--r--tags/a5/c9/CAEozd0w8tu2cgbuTXn7ABsz3_rkWf4RmUytnQ8iJOzQqFEKR8g@mail.gmail.com/inbox0
-rw-r--r--tags/a5/c9/CAEozd0w8tu2cgbuTXn7ABsz3_rkWf4RmUytnQ8iJOzQqFEKR8g@mail.gmail.com/old0
-rw-r--r--tags/a5/c9/CAEozd0w8tu2cgbuTXn7ABsz3_rkWf4RmUytnQ8iJOzQqFEKR8g@mail.gmail.com/sugar0
-rw-r--r--tags/a5/c9/CALaXfOWwqV1sRJ1u44pkWR+J6OGo_WV-O8JKkcTmodmVoveECA@mail.gmail.com/debian0
-rw-r--r--tags/a5/c9/CALaXfOWwqV1sRJ1u44pkWR+J6OGo_WV-O8JKkcTmodmVoveECA@mail.gmail.com/inbox0
-rw-r--r--tags/a5/c9/CALaXfOWwqV1sRJ1u44pkWR+J6OGo_WV-O8JKkcTmodmVoveECA@mail.gmail.com/old0
-rw-r--r--tags/a5/c9/CAM1Sok23KmXbo=B=RzM=ARTDVB3RdXrCD97aq0ceipVeYZuCeg@mail.gmail.com/unread0
-rw-r--r--tags/a5/c9/CANTHhvaR1P1BQesPEpXb8ogt_Y=wej8R3_bHvZtku9V947=mrg@mail.gmail.com/sugar0
-rw-r--r--tags/a5/c9/CANTHhvaR1P1BQesPEpXb8ogt_Y=wej8R3_bHvZtku9V947=mrg@mail.gmail.com/unread0
-rw-r--r--tags/a5/c9/E0332A2A-9683-4E41-8AC5-305E769D3644@diku.dk/freedom0
-rw-r--r--tags/a5/c9/E0332A2A-9683-4E41-8AC5-305E769D3644@diku.dk/unread0
-rw-r--r--tags/a5/c9/E1iCVRK-00078q-H7@fasolo.debian.org/debian0
-rw-r--r--tags/a5/c9/E1iCVRK-00078q-H7@fasolo.debian.org/unread0
-rw-r--r--tags/a5/c9/b6625b990907290935o344ee1f6uacafb33edd0e15f3@mail.gmail.com/sugar0
-rw-r--r--tags/a5/c9/b6625b990907290935o344ee1f6uacafb33edd0e15f3@mail.gmail.com/unread0
-rw-r--r--tags/a5/c9/ce1596122903fd75eb96dd777b309c47@www.masterbases.com.br/inbox0
-rw-r--r--tags/a5/c9/ce1596122903fd75eb96dd777b309c47@www.masterbases.com.br/old0
-rw-r--r--tags/a5/c9/ce1596122903fd75eb96dd777b309c47@www.masterbases.com.br/sugar0
-rw-r--r--tags/a5/c9/e574f6eb0907271729l2e5f2b4ax6663769fdf0348f0@mail.gmail.com/sugar0
-rw-r--r--tags/a5/c9/e574f6eb0907271729l2e5f2b4ax6663769fdf0348f0@mail.gmail.com/unread0
-rw-r--r--tags/a5/c9/l0311070bb02a079140b3@%5b192.168.1.2%5d/inbox0
-rw-r--r--tags/a5/c9/l0311070bb02a079140b3@%5b192.168.1.2%5d/old0
-rw-r--r--tags/a5/c9/l03130308b47e68bf550d@%5b169.254.171.223%5d/inbox0
-rw-r--r--tags/a5/c9/l03130308b47e68bf550d@%5b169.254.171.223%5d/old0
-rw-r--r--tags/a5/c9/l03130308b47e68bf550d@%5b169.254.171.223%5d/replied0
55 files changed, 0 insertions, 0 deletions