summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-04-17 04:32:31 +0000
committerDamien Miller <djm@mindrot.org>2015-04-29 18:13:34 +1000
commit17d4d9d9fbc8fb80e322f94d95eecc604588a474 (patch)
treeca53819c6abde095fb6243ef62d69a178e7da445
parent40132ff87b6cbc3dc05fb5df2e9d8e3afa06aafd (diff)
upstream commit
don't call record_login() in monitor when UseLogin is enabled; bz#278 reported by drk AT sgi.com; ok dtucker
-rw-r--r--monitor.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c
index bab6ce87e..fb3ea6753 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.145 2015/02/20 22:17:21 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.146 2015/04/17 04:32:31 djm Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1474,6 +1474,9 @@ mm_record_login(Session *s, struct passwd *pw)
1474 socklen_t fromlen; 1474 socklen_t fromlen;
1475 struct sockaddr_storage from; 1475 struct sockaddr_storage from;
1476 1476
1477 if (options.use_login)
1478 return;
1479
1477 /* 1480 /*
1478 * Get IP address of client. If the connection is not a socket, let 1481 * Get IP address of client. If the connection is not a socket, let
1479 * the address be 0.0.0.0. 1482 * the address be 0.0.0.0.