Allow the file descriptor received from the client to be -1.

This commit is contained in:
nicm 2013-10-10 11:49:07 +00:00
parent d75dd2ab1c
commit 47a4a9992c

View File

@ -825,8 +825,6 @@ server_client_msg_dispatch(struct client *c)
case MSG_IDENTIFY:
if (datalen != sizeof identifydata)
fatalx("bad MSG_IDENTIFY size");
if (imsg.fd == -1)
fatalx("MSG_IDENTIFY missing fd");
memcpy(&identifydata, imsg.data, sizeof identifydata);
server_client_msg_identify(c, &identifydata, imsg.fd);
@ -972,6 +970,8 @@ server_client_msg_identify(
return;
}
if (fd == -1)
return;
if (!isatty(fd)) {
close(fd);
return;