Merge commit 'jrollins/master'

[monkeysphere.git] / src / share / ma / add_certifier

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 024255f162d73308e298bbeabd7332f141ec0aca..e2df1d3b0072786109544d8fb5bff04b9c073880 100644 (file)
--- 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")