[Pkg-privacy-commits] [monkeysphere] 02/02: fix diagnostic check and recommendation for good authorizedkeysfile in sshd_config

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository monkeysphere.

commit 321b5dca3604699a1abd8e60cfcf196b005f60c7
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue May 5 12:11:00 2015 -0400

    fix diagnostic check and recommendation for good authorizedkeysfile in sshd_config
---
 src/share/ma/diagnostics | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/share/ma/diagnostics b/src/share/ma/diagnostics
index abf207e..a59244a 100644
--- a/src/share/ma/diagnostics
+++ b/src/share/ma/diagnostics
@@ -122,9 +122,9 @@ echo "Checking for Monkeysphere-enabled public-key authentication for users ..."
 # Ensure that User ID authentication is enabled:
 if echo "AuthorizedKeysFile foo bar" | /usr/sbin/sshd -t -f /dev/stdin; then
     # OpenSSH >= 6.0, multiple authorized_keys file supported
-    if ! grep -q "^AuthorizedKeysFile[[:space:]]\+.*[[:space:]]\*${SYSDATADIR}/authorized_keys/%u$" "$sshd_config"; then
+    if ! grep -q "^AuthorizedKeysFile[[:space:]]\+.*[[:space:]]*${SYSDATADIR}/authorized_keys/%u$" "$sshd_config"; then
         echo "! $sshd_config does not point to monkeysphere authorized keys."
-        echo " - Recommendation: add a line to $sshd_config: 'AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 ${SYSDATADIR}/authorized_keys/%u'"
+        echo " - Recommendation: add a line to $sshd_config: 'AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys2 ${SYSDATADIR}/authorized_keys/%u'"
         problemsfound=$(($problemsfound+1))
     fi
     if [ "$RAW_AUTHORIZED_KEYS" != none ]; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/monkeysphere.git