summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/man8/monkeysphere-authentication.82
-rw-r--r--src/share/ma/setup2
-rw-r--r--src/share/ma/update_users2
-rwxr-xr-xtests/basic2
4 files changed, 4 insertions, 4 deletions
diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8
index 56543fb..38df65d 100644
--- a/man/man8/monkeysphere-authentication.8
+++ b/man/man8/monkeysphere-authentication.8
@@ -161,7 +161,7 @@ If set to `false', never prompt the user for confirmation. (true)
/etc/monkeysphere/monkeysphere-authentication.conf
System monkeysphere-authentication config file.
.TP
-/var/lib/monkeysphere/authentication/authorized_keys/USER
+/var/lib/monkeysphere/authorized_keys/USER
Monkeysphere-generated user authorized_keys files.
.SH AUTHOR
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 6969d71..248406f 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?
diff --git a/src/share/ma/update_users b/src/share/ma/update_users
index e9e3cc6..092d108 100644
--- a/src/share/ma/update_users
+++ b/src/share/ma/update_users
@@ -35,7 +35,7 @@ MODE="authorized_keys"
GNUPGHOME="$GNUPGHOME_SPHERE"
# the authorized_keys directory
-authorizedKeysDir="${MADATADIR}/authorized_keys"
+authorizedKeysDir="${SYSDATADIR}/authorized_keys"
# check to see if the gpg trust database has been initialized
if [ ! -s "${GNUPGHOME}/trustdb.gpg" ] ; then
diff --git a/tests/basic b/tests/basic
index 18e3019..9ae9c1c 100755
--- a/tests/basic
+++ b/tests/basic
@@ -158,7 +158,7 @@ cp "$TESTDIR"/etc/ssh/sshd_config "$SSHD_CONFIG"
# write the sshd_config
cat <<EOF >> "$SSHD_CONFIG"
HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
-AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authentication/authorized_keys/%u
+AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
EOF