projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed monkeysphere.7 synopsis to be less ssh-specific
[monkeysphere.git]
/
src
/
monkeysphere-host
diff --git
a/src/monkeysphere-host
b/src/monkeysphere-host
index 884c1b794524951d8ed90bb94339a5f2c9301952..12e7bad468ff3ab6dfdf316f505924f32d1bd7d7 100755
(executable)
--- a/
src/monkeysphere-host
+++ b/
src/monkeysphere-host
@@
-147,7
+147,7
@@
Service names should use fully-qualified domain names (FQDN), but the
domain name you chose appears to only have the local part. For
example: don't use 'ssh://foo' ; use 'ssh://foo.example.com' instead."
domain name you chose appears to only have the local part. For
example: don't use 'ssh://foo' ; use 'ssh://foo.example.com' instead."
- [[ "$name" =~ ^[a-z]([a-z0-9-]*[a-z0-9])?://[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.|((\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+))(:[1-9][0-9]{0,4})?$ ]] || \
+ [[ "$name" =~ ^[a-z
0-9
]([a-z0-9-]*[a-z0-9])?://[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.|((\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+))(:[1-9][0-9]{0,4})?$ ]] || \
failure "Not a valid service name: '$name'
Service names look like <scheme>://full.example.com[:<portnumber>],
failure "Not a valid service name: '$name'
Service names look like <scheme>://full.example.com[:<portnumber>],
@@
-256,11
+256,12
@@
multi_key() {
shift
local keys=$@
local i=0
shift
local keys=$@
local i=0
- local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
local key
check_no_keys
local key
check_no_keys
+ local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+
if [[ -z "$1" || "$1" == '--all' ]] ; then
keys="${fprs[@]}"
fi
if [[ -z "$1" || "$1" == '--all' ]] ; then
keys="${fprs[@]}"
fi
@@
-301,7
+302,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
- gpg --export "$fingerprint" 2>/dev/null \
+ gpg --export
--no-armor
"$fingerprint" 2>/dev/null \
| openpgp2ssh 2>/dev/null >"$tmpssh"
# list the host key info
| openpgp2ssh 2>/dev/null >"$tmpssh"
# list the host key info
@@
-378,7
+379,7
@@
COMMAND="$1"
shift
case $COMMAND in
shift
case $COMMAND in
- 'import-key'|'i')
+ 'import-key'|'i
mport'|'i
')
source "${MHSHAREDIR}/import_key"
import_key "$@"
;;
source "${MHSHAREDIR}/import_key"
import_key "$@"
;;
@@
-387,7
+388,7
@@
case $COMMAND in
multi_key show_key "$@"
;;
multi_key show_key "$@"
;;
- 'set-expire'|'extend-key'|'e')
+ 'set-expire'|'extend-key'|'e
xtend'|'e
')
source "${MHSHAREDIR}/set_expire"
set_expire "$@"
;;
source "${MHSHAREDIR}/set_expire"
set_expire "$@"
;;
@@
-426,7
+427,7
@@
case $COMMAND in
update_pgp_pub_file
;;
update_pgp_pub_file
;;
- 'version'|'v')
+ 'version'|'
--version'|'
v')
version
;;
version
;;