summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-06-26 09:47:43 +1000
committerDamien Miller <djm@mindrot.org>2010-06-26 09:47:43 +1000
commit1b2b61e6f87810354c9a47448fbdb483f33413b0 (patch)
tree07c9e0edcf9cda08cc08184210ccd2949505cb5e
parent0e76c5e50227ca2fc4e8e8846b0ec911f26e0684 (diff)
- djm@cvs.openbsd.org 2010/06/22 04:59:12
[session.c] include the user name on "subsystem request for ..." log messages; bz#1571; ok dtucker@
-rw-r--r--ChangeLog4
-rw-r--r--session.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5475328b..60b571e94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,10 @@
46 [ssh-keyscan.c] 46 [ssh-keyscan.c]
47 replace verbose and overflow-prone Linebuf code with read_keyfile_line() 47 replace verbose and overflow-prone Linebuf code with read_keyfile_line()
48 based on patch from joachim AT joachimschipper.nl; bz#1565; ok dtucker@ 48 based on patch from joachim AT joachimschipper.nl; bz#1565; ok dtucker@
49 - djm@cvs.openbsd.org 2010/06/22 04:59:12
50 [session.c]
51 include the user name on "subsystem request for ..." log messages;
52 bz#1571; ok dtucker@
49 53
5020100622 5420100622
51 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 55 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
diff --git a/session.c b/session.c
index 7e19299cb..5de0ac897 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.254 2010/06/18 03:16:03 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.255 2010/06/22 04:59:12 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -2165,7 +2165,8 @@ session_subsystem_req(Session *s)
2165 u_int i; 2165 u_int i;
2166 2166
2167 packet_check_eom(); 2167 packet_check_eom();
2168 logit("subsystem request for %.100s", subsys); 2168 logit("subsystem request for %.100s by user %s", subsys,
2169 s->pw->pw_name);
2169 2170
2170 for (i = 0; i < options.num_subsystems; i++) { 2171 for (i = 0; i < options.num_subsystems; i++) {
2171 if (strcmp(subsys, options.subsystem_name[i]) == 0) { 2172 if (strcmp(subsys, options.subsystem_name[i]) == 0) {