summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/auth.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2006-03-30 11:40:21 +0000
committerdtucker <dtucker@openbsd.org>2006-03-30 11:40:21 +0000
commitadf0e4b7ef853c4548810d866b89a7af6d89f11c (patch)
tree6a95e5a4faba811d0839ec1f3f08de8a4bd5b503 /usr.bin/ssh/auth.c
parentCorrectly handle truncated files while converting keys; ok djm@ (diff)
downloadwireguard-openbsd-adf0e4b7ef853c4548810d866b89a7af6d89f11c.tar.xz
wireguard-openbsd-adf0e4b7ef853c4548810d866b89a7af6d89f11c.zip
Prevent duplicate log messages when privsep=yes; ok djm@
Diffstat (limited to 'usr.bin/ssh/auth.c')
-rw-r--r--usr.bin/ssh/auth.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c
index b838a3ad6e3..c828cb0fafd 100644
--- a/usr.bin/ssh/auth.c
+++ b/usr.bin/ssh/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.66 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.67 2006/03/30 11:40:21 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -45,9 +45,11 @@
#include "misc.h"
#include "bufaux.h"
#include "packet.h"
+#include "monitor_wrap.h"
/* import */
extern ServerOptions options;
+extern int use_privsep;
/* Debugging messages */
Buffer auth_debug;
@@ -166,6 +168,9 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info)
void (*authlog) (const char *fmt,...) = verbose;
char *authmsg;
+ if (use_privsep && !mm_is_monitor() && !authctxt->postponed)
+ return;
+
/* Raise logging level */
if (authenticated == 1 ||
!authctxt->valid ||