From bf9e7a1c688eaa48dc2c0900ccd12a06e35c3ae4 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 19 Mar 2012 08:42:06 +0000 Subject: [PATCH] Move MSG_IDENTIFY to the last sent by the client, this will be needed by control clients and irrelevant for others. --- client.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client.c b/client.c index d2e53b6d..683aa54c 100644 --- a/client.c +++ b/client.c @@ -250,11 +250,6 @@ client_send_identify(int flags) strlcpy(data.term, term, sizeof data.term) >= sizeof data.term) *data.term = '\0'; - if ((fd = dup(STDIN_FILENO)) == -1) - fatal("dup failed"); - imsg_compose(&client_ibuf, - MSG_IDENTIFY, PROTOCOL_VERSION, -1, fd, &data, sizeof data); - if ((fd = dup(STDOUT_FILENO)) == -1) fatal("dup failed"); imsg_compose(&client_ibuf, @@ -264,6 +259,11 @@ client_send_identify(int flags) fatal("dup failed"); imsg_compose(&client_ibuf, MSG_STDERR, PROTOCOL_VERSION, -1, fd, NULL, 0); + + if ((fd = dup(STDIN_FILENO)) == -1) + fatal("dup failed"); + imsg_compose(&client_ibuf, + MSG_IDENTIFY, PROTOCOL_VERSION, -1, fd, &data, sizeof data); } /* Forward entire environment to server. */