From 1315b1ad119936d0bf281a04d8672c20a78a1838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Zuzelski?= Date: Thu, 24 Jun 2010 12:03:58 +0200 Subject: [PATCH] Better warning message for multi-keys per pubkey file "WARNING: a pubkey file can only have one line (key); ignoring $pubkey" message was a bit confusing, because elsewhere the docs claim multiple keys are suported. Added note on how to add multiple keys for single user and pointer to the doc file concerned. --- src/gl-compile-conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gl-compile-conf b/src/gl-compile-conf index b1277fc..f80c035 100755 --- a/src/gl-compile-conf +++ b/src/gl-compile-conf @@ -607,7 +607,10 @@ for my $pubkey (`find . -type f`) # don't trust files with multiple lines (i.e., something after a newline) if ($pubkey_content =~ /\n./) { - print STDERR "WARNING: a pubkey file can only have one line (key); ignoring $pubkey\n"; + print STDERR "WARNING: a pubkey file can only have one line (key); ignoring $pubkey\n" . + " If you want to add multiple public keys for a single user, use\n" . + " \"user\@host.pub\" file names. See the \"one user, many keys\"\n" . + " section in doc/3-faq-tips-etc.mkd for details.\n"; next; } print $newkeys_fh "command=\"$AUTH_COMMAND $user\",$AUTH_OPTIONS ";