X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fma%2Fsetup;h=441df2808b920a061aeb5774051e5e39f24b4821;hb=07e96da7841640d7f38318faec682fb4da1ba7d0;hp=6969d71dd4954f59b2905c28e95612218494db2e;hpb=e2b547631eae05103fe3219f4e2c7a4f618ef5d0;p=monkeysphere.git

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 6969d71..441df28 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -19,7 +19,7 @@ setup() {
     chmod 700 "${GNUPGHOME_CORE}"
     mkdir -p "${GNUPGHOME_SPHERE}"
     chmod 700 "${GNUPGHOME_SPHERE}"
-    mkdir -p "${MADATADIR}"/authorized_keys
+    mkdir -p "${SYSDATADIR}"/authorized_keys
 
     # deliberately replace the config files via truncation
     # FIXME: should we be dumping to tmp files and then moving atomically?
@@ -80,7 +80,7 @@ EOF
     # ensure that the authentication sphere checker has absolute ownertrust on the expected key.
     log debug "setting ultimate owner trust on core key in gpg_sphere..."
     printf "%s:6:\n" "$CORE_FPR" | gpg_sphere "--import-ownertrust"
-    gpg_sphere "--export-ownertrust"
+    gpg_sphere "--export-ownertrust" 2>&1 | log debug
 
     # check the owner trust
     log debug "checking gpg_sphere owner trust set properly..."