Sync OpenBSD patchset 1071:

Move MSG_IDENTIFY to the last sent by the client, this will be needed by
control clients and irrelevant for others.
pull/1/head
Tiago Cunha 2012-03-29 21:02:34 +00:00
parent 2e2c9bd623
commit 621fa0a686
1 changed files with 5 additions and 5 deletions

View File

@ -252,11 +252,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,
@ -266,6 +261,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. */