From 2e2e762743417ae7a0c32a4b40909ecdf3bb3560 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Mon, 24 Aug 2009 16:24:18 +0000
Subject: 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.
---
 cmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmd.c')

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
-- 
cgit