projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dkg/master'
[monkeysphere.git]
/
src
/
common
diff --git
a/src/common
b/src/common
index eb3a08343819bcec665b8387e950f661984086a5..ef931ca4bc7a20282be621bfa533830c9cfef8bb 100644
(file)
--- a/
src/common
+++ b/
src/common
@@
-1,9
+1,10
@@
# -*-shell-script-*-
# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Shared sh functions for the monkeysphere
#
# Written by
# Shared sh functions for the monkeysphere
#
# Written by
-# Jameson Rollins <jrollins@fi
fthhorseman
.net>
+# Jameson Rollins <jrollins@fi
nestructure
.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
@@
-674,7
+675,7
@@
process_user_id() {
else
log debug " - unacceptable primary key."
if [ -z "$sshKey" ] ; then
else
log debug " - unacceptable primary key."
if [ -z "$sshKey" ] ; then
- log
error
" ! primary key could not be translated (not RSA or DSA?)."
+ log
debug
" ! primary key could not be translated (not RSA or DSA?)."
else
echo "1:${sshKey}"
fi
else
echo "1:${sshKey}"
fi
@@
-732,7
+733,7
@@
process_user_id() {
else
log debug " - unacceptable sub key."
if [ -z "$sshKey" ] ; then
else
log debug " - unacceptable sub key."
if [ -z "$sshKey" ] ; then
- log
error
" ! sub key could not be translated (not RSA or DSA?)."
+ log
debug
" ! sub key could not be translated (not RSA or DSA?)."
else
echo "1:${sshKey}"
fi
else
echo "1:${sshKey}"
fi