projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switched $USER to $FILE_OWNER; new name is more semantically clear and less likely...
[monkeysphere.git]
/
src
/
monkeysphere-host
diff --git
a/src/monkeysphere-host
b/src/monkeysphere-host
index fc3b607b02f82c3c53f59a1aafdbfe7932833b39..b9a15ae5c96c70dea455f9302a10621324c1877e 100755
(executable)
--- a/
src/monkeysphere-host
+++ b/
src/monkeysphere-host
@@
-21,7
+21,8
@@
PGRM=$(basename $0)
SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
export SYSSHAREDIR
SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
export SYSSHAREDIR
-. "${SYSSHAREDIR}/common" || exit 1
+. "${SYSSHAREDIR}/defaultenv"
+. "${SYSSHAREDIR}/common"
SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
export SYSDATADIR
SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
export SYSDATADIR
@@
-41,9
+42,6
@@
DATE=$(date -u '+%FT%T')
# unset some environment variables that could screw things up
unset GREP_OPTIONS
# unset some environment variables that could screw things up
unset GREP_OPTIONS
-# default return code
-RETURN=0
-
########################################################################
# FUNCTIONS
########################################################################
########################################################################
# FUNCTIONS
########################################################################
@@
-177,7
+175,7
@@
show_key() {
# create the ssh key
TMPSSH="$GNUPGHOME"/ssh_host_key_rsa_pub
# create the ssh key
TMPSSH="$GNUPGHOME"/ssh_host_key_rsa_pub
-
openpgp2ssh <"$HOST_KEY_FILE"
2>/dev/null >"$TMPSSH"
+
gpg --export | openpgp2ssh
2>/dev/null >"$TMPSSH"
# get the gpg fingerprint
HOST_FINGERPRINT=$(gpg --quiet --list-keys --with-colons --with-fingerprint \
# get the gpg fingerprint
HOST_FINGERPRINT=$(gpg --quiet --list-keys --with-colons --with-fingerprint \
@@
-193,7
+191,7
@@
show_key() {
# list revokers, if there are any
revokers=$(gpg --list-keys --with-colons --fixed-list-mode \
# list revokers, if there are any
revokers=$(gpg --list-keys --with-colons --fixed-list-mode \
- |
grep '^rvk:' | cut -d: -f10) || true
+ |
awk -F: '/^rvk:/{ print $10 }' )
if [ "$revokers" ] ; then
echo "The following keys are allowed to revoke this host key:"
for key in $revokers ; do
if [ "$revokers" ] ; then
echo "The following keys are allowed to revoke this host key:"
for key in $revokers ; do
@@
-315,7
+313,7
@@
case $COMMAND in
;;
'version'|'v')
;;
'version'|'v')
- echo "$VERSION"
+ version
;;
'--help'|'help'|'-h'|'h'|'?')
;;
'--help'|'help'|'-h'|'h'|'?')
@@
-327,5
+325,3
@@
case $COMMAND in
Type '$PGRM help' for usage."
;;
esac
Type '$PGRM help' for usage."
;;
esac
-
-exit "$RETURN"