diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-31 23:14:23 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-31 23:14:23 +1100 |
commit | 7a8f5b330dc7a98e7144ec119a7b5b0737a26708 (patch) | |
tree | ff3743ad84d2f393288fb2ee08298e17a06f47a2 /auth.c | |
parent | e23209f4349343d75c66fd8c71a57942d8827f54 (diff) |
- dtucker@cvs.openbsd.org 2006/03/30 11:40:21
[auth.c monitor.c]
Prevent duplicate log messages when privsep=yes; ok djm@
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.67 2006/03/30 11:40:21 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -61,6 +61,7 @@ | |||
61 | 61 | ||
62 | /* import */ | 62 | /* import */ |
63 | extern ServerOptions options; | 63 | extern ServerOptions options; |
64 | extern int use_privsep; | ||
64 | extern Buffer loginmsg; | 65 | extern Buffer loginmsg; |
65 | 66 | ||
66 | /* Debugging messages */ | 67 | /* Debugging messages */ |
@@ -237,6 +238,9 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info) | |||
237 | void (*authlog) (const char *fmt,...) = verbose; | 238 | void (*authlog) (const char *fmt,...) = verbose; |
238 | char *authmsg; | 239 | char *authmsg; |
239 | 240 | ||
241 | if (use_privsep && !mm_is_monitor() && !authctxt->postponed) | ||
242 | return; | ||
243 | |||
240 | /* Raise logging level */ | 244 | /* Raise logging level */ |
241 | if (authenticated == 1 || | 245 | if (authenticated == 1 || |
242 | !authctxt->valid || | 246 | !authctxt->valid || |