summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/share/ma/add_certifier4
-rw-r--r--src/share/ma/setup2
-rw-r--r--src/share/mh/add_revoker1
3 files changed, 6 insertions, 1 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 024255f..e2df1d3 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -51,6 +51,9 @@ while true ; do
depth="$2"
shift 2
;;
+ -)
+ break
+ ;;
*)
if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
failure "Unknown option '$1'.
@@ -83,6 +86,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
fi
# check the key is ok as monkeysphere user before loading
+ log debug "checking keys in file..."
fingerprint=$(su_monkeysphere_user \
". ${SYSSHAREDIR}/common; list_primary_fingerprints" < "$keyID")
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 8929871..e77afff 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -13,7 +13,7 @@
setup() {
# make all needed directories
- log debug "make authentication directory structure..."
+ log debug "checking authentication directory structure..."
mkdir -p "${MADATADIR}"
chmod 0750 "${MADATADIR}"
chgrp "$MONKEYSPHERE_USER" "${MADATADIR}"
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index c6f9a58..2275f61 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -46,6 +46,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
fi
# check the key is ok as monkeysphere user before loading
+ log debug "checking keys in file..."
fingerprint=$(su_monkeysphere_user \
". ${SYSSHAREDIR}/common; list_primary_fingerprints" < "$keyID")