fix arg parsing in add_certifier to allow of - for stdin read.

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")
 

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 89298711e01ea77853924734ff8da2ca7be9a8ea..e77afff4299795c7a442bccf43e74dea1f2884e3 100644 (file)
--- 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 c6f9a585326e23bde85e6698a777499fd09d97f4..2275f6119688bbaf199f32086111b4f080e72942 100644 (file)
--- 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")