X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fma%2Fsetup;h=f9910507c39fd6ad4724bbfbb62a879a50da1c41;hb=48cb182a7d0265aabed84d74b010ff0b24fa078c;hp=54ab5be186851c2194b7a38c1965860e59337dff;hpb=39996655a57ca3167e733d0a0457941ae4060270;p=monkeysphere.git

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 54ab5be..f991050 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -13,12 +13,17 @@
 
 setup() {
     # make all needed directories
+    log debug "checking authentication directory structure..."
     mkdir -p "${MADATADIR}"
+    chmod 0750 "${MADATADIR}"
+    chgrp "$MONKEYSPHERE_USER" "${MADATADIR}"
     mkdir -p "${MATMPDIR}"
+    chmod 0750 "${MATMPDIR}"
+    chgrp "$MONKEYSPHERE_USER" "${MATMPDIR}"
     mkdir -p "${GNUPGHOME_CORE}"
-    chmod 700 "${GNUPGHOME_CORE}"
+    chmod 0700 "${GNUPGHOME_CORE}"
     mkdir -p "${GNUPGHOME_SPHERE}"
-    chmod 700 "${GNUPGHOME_SPHERE}"
+    chmod 0700 "${GNUPGHOME_SPHERE}"
     mkdir -p "${SYSDATADIR}"/authorized_keys
 
     # deliberately replace the config files via truncation
@@ -52,7 +57,7 @@ EOF
     if [ -z "$CORE_FPR" ] ; then
 	log info "setting up Monkeysphere authentication trust core..."
 
-	local CORE_UID=$(printf "Monkeysphere authentication trust core UID (random string: %s)" $(head -c21 </dev/urandom | base64))
+	local CORE_UID=$(printf "Monkeysphere authentication trust core UID (random string: %s)" $(head -c21 </dev/urandom | perl -MMIME::Base64 -ne 'print encode_base64($_)'))
     
 	log debug "generating monkeysphere authentication trust core key ($CORE_KEYLENGTH bits)..."
 	PEM2OPENPGP_USAGE_FLAGS=certify \