author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Sat, 18 May 2013 09:18:20 -0700 | |
changeset 1306 | 11b376b53ac1 |
permissions | -rw-r--r-- |
1306
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
--- a/agent/mibgroup/ucd-snmp/proxy.c 2006-10-17 18:16:29.000000000 +0200 |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
+++ b/agent/mibgroup/ucd-snmp/proxy.c 2012-03-27 09:02:10.488425400 +0200 |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
@@ -396,6 +396,8 @@ |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
|
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
if (!pdu || !sp) { |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
netsnmp_set_request_error(reqinfo, requests, SNMP_ERR_GENERR); |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
+ if (pdu) |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
+ snmp_free_pdu(pdu); |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
return SNMP_ERR_NOERROR; |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
} |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
|
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
@@ -408,6 +410,8 @@ |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
/* |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
* too large |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
*/ |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
+ if (pdu) |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
+ snmp_free_pdu(pdu); |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
snmp_log(LOG_ERR, |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
"proxy oid request length is too long\n"); |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
return SNMP_ERR_NOERROR; |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
21 |
@@ -437,6 +441,8 @@ |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
22 |
*/ |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
23 |
if (!proxy_fill_in_session(handler, reqinfo, (void **)&configured)) { |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
24 |
netsnmp_set_request_error(reqinfo, requests, SNMP_ERR_GENERR); |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
25 |
+ if (pdu) |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
26 |
+ snmp_free_pdu(pdu); |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
27 |
return SNMP_ERR_NOERROR; |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
28 |
} |
11b376b53ac1
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
29 |