From c05a47ad0d4522785199f4b724f10a8814058fb1 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 22 Dec 2010 15:32:40 +0000 Subject: Sync OpenBSD patchset 804: Undo a change to next/previous session that got mixed in prematurely. --- session.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/session.c b/session.c index 8fcb5c4d..40e9731f 100644 --- a/session.c +++ b/session.c @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.80 2010-12-22 15:31:56 tcunha Exp $ */ +/* $Id: session.c,v 1.81 2010-12-22 15:32:40 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -186,9 +186,10 @@ session_next_session(struct session *s) struct session *s2; u_int i; - if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s)) + if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0) return (NULL); + i = 0; do { if (i == ARRAY_LENGTH(&sessions) - 1) i = 0; @@ -207,7 +208,7 @@ session_previous_session(struct session *s) struct session *s2; u_int i; - if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s)) + if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0) return (NULL); do { -- cgit