summaryrefslogtreecommitdiff
path: root/auth.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-06-02 07:41:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-06-02 07:41:51 +1000
commit0acca3797d53d958d240c69a5f222f2aa8444858 (patch)
tree0a1e1208f2d9abed88716b9a12e091864e2f8d2d /auth.h
parent74836ae0fabcc1a76b9d9eacd1629c88a054b2d0 (diff)
- djm@cvs.openbsd.org 2013/05/19 02:42:42
[auth.h auth.c key.c monitor.c auth-rsa.c auth2.c auth1.c key.h] Standardise logging of supplemental information during userauth. Keys and ruser is now logged in the auth success/failure message alongside the local username, remote host/port and protocol in use. Certificates contents and CA are logged too. Pushing all logging onto a single line simplifies log analysis as it is no longer necessary to relate information scattered across multiple log entries. "I like it" markus@
Diffstat (limited to 'auth.h')
-rw-r--r--auth.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/auth.h b/auth.h
index 7ff59f1ba..a406e1393 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.73 2013/03/07 19:27:25 markus Exp $ */ 1/* $OpenBSD: auth.h,v 1.74 2013/05/19 02:42:42 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -60,6 +60,7 @@ struct Authctxt {
60 struct passwd *pw; /* set if 'valid' */ 60 struct passwd *pw; /* set if 'valid' */
61 char *style; 61 char *style;
62 void *kbdintctxt; 62 void *kbdintctxt;
63 char *info; /* Extra info for next auth_log */
63 void *jpake_ctx; 64 void *jpake_ctx;
64#ifdef BSD_AUTH 65#ifdef BSD_AUTH
65 auth_session_t *as; 66 auth_session_t *as;
@@ -121,6 +122,7 @@ int auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
121int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); 122int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
122int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); 123int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
123int user_key_allowed(struct passwd *, Key *); 124int user_key_allowed(struct passwd *, Key *);
125void pubkey_auth_info(Authctxt *, const Key *);
124 126
125struct stat; 127struct stat;
126int auth_secure_path(const char *, struct stat *, const char *, uid_t, 128int auth_secure_path(const char *, struct stat *, const char *, uid_t,
@@ -148,8 +150,10 @@ void disable_forwarding(void);
148void do_authentication(Authctxt *); 150void do_authentication(Authctxt *);
149void do_authentication2(Authctxt *); 151void do_authentication2(Authctxt *);
150 152
151void auth_log(Authctxt *, int, int, const char *, const char *, 153void auth_info(Authctxt *authctxt, const char *, ...)
152 const char *); 154 __attribute__((__format__ (printf, 2, 3)))
155 __attribute__((__nonnull__ (2)));
156void auth_log(Authctxt *, int, int, const char *, const char *);
153void userauth_finish(Authctxt *, int, const char *, const char *); 157void userauth_finish(Authctxt *, int, const char *, const char *);
154int auth_root_allowed(const char *); 158int auth_root_allowed(const char *);
155 159