svn commit: r252151 - stable/9/lib/libnetgraph

[Gleb Smirnoff]

Author: glebius
Date: Mon Jun 24 09:25:38 2013
New Revision: 252151
URL: http://svnweb.freebsd.org/changeset/base/252151

Log:
  Merge r248159:
    Fix for quite a special case when userland emulates a netgraph node, and
    userland can reply to a message with NGM_HASREPLY bit set. In this case
    we should not wait for a response to a responce.
  
    PR:           176771
    Submitted by: Keith Reynolds <keith.reynolds tidalscale.com>

Modified:
  stable/9/lib/libnetgraph/msg.c
Directory Properties:
  stable/9/lib/libnetgraph/   (props changed)

Modified: stable/9/lib/libnetgraph/msg.c
==============================================================================
--- stable/9/lib/libnetgraph/msg.c	Mon Jun 24 09:23:24 2013	(r252150)
+++ stable/9/lib/libnetgraph/msg.c	Mon Jun 24 09:25:38 2013	(r252151)
@@ -234,7 +234,7 @@ NgDeliverMsg(int cs, const char *path,
 	}
 
 	/* Wait for reply if there should be one. */
-	if (msg->header.cmd & NGM_HASREPLY) {
+	if (msg->header.cmd & NGM_HASREPLY && !(msg->header.flags & NGF_RESP)) {
 		struct pollfd rfds;
 		int n;