- dtucker@cvs.openbsd.org 2006/03/30 11:40:21

     [auth.c monitor.c]
     Prevent duplicate log messages when privsep=yes; ok djm@

1 files changed, 5 insertions, 1 deletions

diff --git a/auth.c b/auth.c
index bf2948a84..e43c81658 100644
--- a/auth.c
+++ b/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.
  *
@@ -61,6 +61,7 @@
 
 /* import */
 extern ServerOptions options;
+extern int use_privsep;
 extern Buffer loginmsg;
 
 /* Debugging messages */
@@ -237,6 +238,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 ||