From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 17 Apr 2015 04:32:31 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17d4d9d9fbc8fb80e322f94d95eecc604588a474;p=thirdparty%2Fopenssh-portable.git

upstream commit

don't call record_login() in monitor when UseLogin is
 enabled; bz#278 reported by drk AT sgi.com; ok dtucker
---

diff --git a/monitor.c b/monitor.c
index bab6ce87e..fb3ea6753 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.145 2015/02/20 22:17:21 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.146 2015/04/17 04:32:31 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1474,6 +1474,9 @@ mm_record_login(Session *s, struct passwd *pw)
 	socklen_t fromlen;
 	struct sockaddr_storage from;
 
+	if (options.use_login)
+		return;
+
 	/*
 	 * Get IP address of client. If the connection is not a socket, let
 	 * the address be 0.0.0.0.