moved directory for monkeysphere-generated authorized_keys files back to its old...

diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8
index 56543fba5882baac5ba07daebd73f73c36e71f98..38df65dbf396d659dfe6efe23ebaad303aba9241 100644 (file)
--- 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 6969d71dd4954f59b2905c28e95612218494db2e..248406fa2ee11fefc58b529fdd6e9f526a965ea8 100644 (file)
--- 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 e9e3cc60387f899469c1361ae12d56c4bde3d0cc..092d10870c6e8356bbec956ec3ed4f844cf734a5 100644 (file)
--- 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 18e301936d52b0fc8c464742c8030420a00b6b00..9ae9c1caaaa77237c5a5aff0947b5284572b5971 100755 (executable)
--- 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