--- agent/mibgroup/agentx/protocol.c.orig	2010-08-08 18:05:53.000000000 +0200
+++ agent/mibgroup/agentx/protocol.c	2010-08-08 18:10:49.000000000 +0200
@@ -656,7 +656,7 @@
     DEBUGINDENTLESS();
 
     if (pdu->flags & AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT) {
-        DEBUGDUMPHEADER("send", "Community");
+        DEBUGDUMPHEADER("send", "Context");
         if (!agentx_realloc_build_string
             (buf, buf_len, out_len, allow_realloc, pdu->community,
              pdu->community_len, network_order)) {
@@ -689,12 +689,12 @@
      * Various PDU types don't include context information (RFC 2741, p. 20). 
      */
     switch (pdu->command) {
-    case AGENTX_MSG_OPEN:
-    case AGENTX_MSG_CLOSE:
-    case AGENTX_MSG_RESPONSE:
-    case AGENTX_MSG_COMMITSET:
-    case AGENTX_MSG_UNDOSET:
-    case AGENTX_MSG_CLEANUPSET:
+    case AGENTX_MSG_OPEN:   // ok
+    case AGENTX_MSG_CLOSE:  // ok
+    case AGENTX_MSG_RESPONSE:   //FIXME! ck
+    case AGENTX_MSG_COMMITSET:  //not tested
+    case AGENTX_MSG_UNDOSET:    //not tested
+    case AGENTX_MSG_CLEANUPSET: //not tested
         pdu->flags &= ~(AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT);
     }
 
@@ -706,7 +706,7 @@
 	{	
 		pdu->community     = strdup(pdu->contextName);
 		pdu->community_len = pdu->contextNameLen;
-		pdu->flags |= AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT;
+		pdu->flags |= AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT;  //FIXME
 	}
 
     /*
@@ -1470,6 +1470,7 @@
     }
 
     DEBUGDUMPHEADER("recv", "AgentX Header");
+    DEBUGDUMPSETUP("recv", bufp, 4);    //XXX added; ck
     DEBUGDUMPHEADER("recv", "Version");
     DEBUGDUMPSETUP("recv", bufp, 1);
     pdu->version = AGENTX_VERSION_BASE | *bufp;
@@ -1492,6 +1493,12 @@
     DEBUGINDENTLESS();
     bufp++;
 
+    if ((pdu->command == AGENTX_MSG_RESPONSE) &&
+        (pdu->flags & AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT)) { //XXX FIXME! added ck
+        snmp_log(LOG_ERR, "NET-SNMP AGENTX_MSG_RESPONSE with AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT set!\n");
+        pdu->flags &= (~AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT); // this flag must be cleared for a response after (RFC 2741, p. 20).!
+    }
+
     DEBUGDUMPHEADER("recv", "Reserved Byte");
     DEBUGDUMPSETUP("recv", bufp, 1);
     DEBUGMSG(("dumpv_recv", "  Reserved:\t0x%x\n", *bufp));
@@ -1528,6 +1535,7 @@
     DEBUGINDENTLESS();
     bufp += 4;
 
+    DEBUGINDENTLESS();                  //XXX added too; ck
     *length -= 20;
     if (*length != payload) {   /* Short payload */
         return NULL;
