File bug-132316_net-snmp-5.1.3.1_order.patch of Package net-snmp

File bug-132316_net-snmp-5.1.3.1_order.patch of Package net-snmp (Revision 9546aaa9261c02057d7457150324f198)

Currently displaying revision 9546aaa9261c02057d7457150324f198, show latest

Index: agent/mibgroup/agentx/master_admin.c
===================================================================
--- agent/mibgroup/agentx/master_admin.c.orig	2005-08-17 14:36:13.000000000 +0200
+++ agent/mibgroup/agentx/master_admin.c	2007-01-15 18:41:16.649892423 +0100
@@ -130,14 +130,6 @@ close_agentx_session(netsnmp_session * s
 
     DEBUGMSGTL(("agentx/master", "close %08p, %d\n", session, sessid));
     if (session != NULL && sessid == -1) {
-        unregister_mibs_by_session(session);
-        unregister_index_by_session(session);
-        snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
-                            SNMPD_CALLBACK_REQ_UNREG_SYSOR_SESS,
-                            (void*)session);
-	if (session->myvoid != NULL) {
-	  free(session->myvoid);
-	}
         /*
          * The following is necessary to avoid locking up the agent when
          * a sugagent dies during a set request. We must clean up the
@@ -151,7 +143,12 @@ close_agentx_session(netsnmp_session * s
                 netsnmp_remove_delegated_requests_for_session(subsession);
             }
         }
-                
+
+        unregister_mibs_by_session(session);
+        unregister_index_by_session(session);
+        unregister_sysORTable_by_session(session);
+        SNMP_FREE(session->myvoid);
+
         return AGENTX_ERR_NOERROR;
     }
 
Index: agent/mibgroup/agentx/master.c
===================================================================
--- agent/mibgroup/agentx/master.c.orig	2005-08-17 14:36:13.000000000 +0200
+++ agent/mibgroup/agentx/master.c	2007-01-15 18:39:59.033383576 +0100
@@ -243,6 +243,11 @@ agentx_got_response(int operation,
              * probability is that the whole agent has died somehow.  
              */
 
+            netsnmp_handler_mark_requests_as_delegated(requests,
+                                                       REQUEST_IS_NOT_DELEGATED);
+            netsnmp_set_request_error(cache->reqinfo, requests, /* XXXWWW: should be index=0 */
+                                      SNMP_ERR_GENERR);
+
             if (s != NULL) {
                 netsnmp_transport *t = snmp_sess_transport(s);
                 close_agentx_session(session, -1);
@@ -256,10 +261,6 @@ agentx_got_response(int operation,
             } else {
                 DEBUGMSGTL(("agentx/master", "NULL sess_pointer??\n"));
             }
-            netsnmp_handler_mark_requests_as_delegated(requests,
-                                                       REQUEST_IS_NOT_DELEGATED);
-            netsnmp_set_request_error(cache->reqinfo, requests, /* XXXWWW: should be index=0 */
-                                      SNMP_ERR_GENERR);
             ax_session = (netsnmp_session *) cache->localinfo;
             netsnmp_free_agent_snmp_session_by_session(ax_session, NULL);
             netsnmp_free_delegated_cache(cache);