summaryrefslogtreecommitdiffstats
path: root/cmd.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-08-24 16:24:18 +0000
committerTiago Cunha <tcunha@gmx.com>2009-08-24 16:24:18 +0000
commit2e2e762743417ae7a0c32a4b40909ecdf3bb3560 (patch)
tree5bb1acfe9bc3008ee8197c6daa12e8e2ce88658e /cmd.c
parent266c13df18bb576bbda4a417c429a66a8929c6af (diff)
Sync OpenBSD patchset 289:
The cursession member in struct cmd_ctx is always either curclient->session or NULL when curclient is also NULL, so just eliminate it.
Diffstat (limited to 'cmd.c')
-rw-r--r--cmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd.c b/cmd.c
index 192d0add..4ff05eb4 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.112 2009-08-09 17:48:55 tcunha Exp $ */
+/* $Id: cmd.c,v 1.113 2009-08-24 16:24:18 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -298,8 +298,8 @@ cmd_current_session(struct cmd_ctx *ctx)
u_int i;
int found;
- if (ctx->cursession != NULL)
- return (ctx->cursession);
+ if (ctx->curclient != NULL && ctx->curclient->session != NULL)
+ return (ctx->curclient->session);
/*
* If the name of the calling client's pty is know, build a list of the