From b2ae7c626164452d3a28b8acfce2493180387198 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sat, 9 Oct 2010 14:31:50 +0000 Subject: [PATCH] Sync OpenBSD patchset 770: Set cause when failing due to linking a window to itself, from Martin Pieuchot. --- server-fn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server-fn.c b/server-fn.c index eb0f2bda..897a38f2 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.112 2010-10-09 14:31:14 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.113 2010-10-09 14:31:50 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -280,8 +280,10 @@ server_link_window(struct session *src, struct winlink *srcwl, if (dstidx != -1) dstwl = winlink_find_by_index(&dst->windows, dstidx); if (dstwl != NULL) { - if (dstwl->window == srcwl->window) + if (dstwl->window == srcwl->window) { + xasprintf(cause, "same index: %d", dstidx); return (-1); + } if (killflag) { /* * Can't use session_detach as it will destroy session