summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-08-29 14:43:45 +0000
committerTiago Cunha <tcunha@gmx.com>2010-08-29 14:43:45 +0000
commit89acd757d0ac9887fc938da32a5d4ba303dce121 (patch)
tree0d1bb2cb88d0d18ea5fcad97b88d9c57c42e7e30
parent56040be3468e655256362c7d5b230b15236b9dd2 (diff)
Sync OpenBSD patchset 752:
MSG_EXIT can now have a return code in the message, so check for that size as well. Stops the client fatal()ing on exit.
-rw-r--r--client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/client.c b/client.c
index 335fdfab..5743bd6b 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.95 2010-07-02 02:52:13 tcunha Exp $ */
+/* $Id: client.c,v 1.96 2010-08-29 14:43:45 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -301,7 +301,8 @@ client_dispatch(void)
client_exitmsg = "detached";
break;
case MSG_EXIT:
- if (datalen != 0)
+ if (datalen != 0 &&
+ datalen != sizeof (struct msg_exit_data))
fatalx("bad MSG_EXIT size");
client_write_server(MSG_EXITING, NULL, 0);