summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-06-26 09:39:25 +1000
committerDamien Miller <djm@mindrot.org>2010-06-26 09:39:25 +1000
commit48147d6801be6b9158c4bcedce6c67b0d591d642 (patch)
tree956720951083943f0519dcb0e3abec1036c4c1b3
parentba3420acd2aceae99aa317ef539b85b047aa6c86 (diff)
- djm@cvs.openbsd.org 2010/06/22 04:49:47
[auth.c] queue auth debug messages for bad ownership or permissions on the user's keyfiles. These messages will be sent after the user has successfully authenticated (where our client will display them with LogLevel=debug).
-rw-r--r--ChangeLog5
-rw-r--r--auth.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fc7ac30ce..556e29fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,11 @@
36 standardise error messages when attempting to open private key 36 standardise error messages when attempting to open private key
37 files to include "progname: filename: error reason" 37 files to include "progname: filename: error reason"
38 bz#1783; ok dtucker@ 38 bz#1783; ok dtucker@
39 - djm@cvs.openbsd.org 2010/06/22 04:49:47
40 [auth.c]
41 queue auth debug messages for bad ownership or permissions on the user's
42 keyfiles. These messages will be sent after the user has successfully
43 authenticated (where our client will display them with LogLevel=debug).
39 44
4020100622 4520100622
41 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 46 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
diff --git a/auth.c b/auth.c
index bec191a59..d1727a4a9 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.87 2010/05/07 11:30:29 djm Exp $ */ 1/* $OpenBSD: auth.c,v 1.88 2010/06/22 04:49:47 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -397,6 +397,8 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
397 logit("Authentication refused for %.100s: " 397 logit("Authentication refused for %.100s: "
398 "bad owner or modes for %.200s", 398 "bad owner or modes for %.200s",
399 pw->pw_name, user_hostfile); 399 pw->pw_name, user_hostfile);
400 auth_debug_add("Ignored %.200s: bad ownership or modes",
401 user_hostfile);
400 } else { 402 } else {
401 temporarily_use_uid(pw); 403 temporarily_use_uid(pw);
402 host_status = check_host_in_hostfile(user_hostfile, 404 host_status = check_host_in_hostfile(user_hostfile,
@@ -520,6 +522,7 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes,
520 secure_filename(f, file, pw, line, sizeof(line)) != 0) { 522 secure_filename(f, file, pw, line, sizeof(line)) != 0) {
521 fclose(f); 523 fclose(f);
522 logit("Authentication refused: %s", line); 524 logit("Authentication refused: %s", line);
525 auth_debug_add("Ignored %s: %s", file_type, line);
523 return NULL; 526 return NULL;
524 } 527 }
525 528