[openhpi-subagent] - rebuilt against net-snmp 5.6 and openhpi 2.15
Dan Horák
sharkcz at fedoraproject.org
Mon Nov 8 12:00:48 UTC 2010
commit 2ae6d718b5107763f5750b668931abe173c07a60
Author: Dan Horák <dan at danny.cz>
Date: Mon Nov 8 13:00:46 2010 +0100
- rebuilt against net-snmp 5.6 and openhpi 2.15
openhpi-subagent-2.3.4-format.patch | 252 +++++++++++++++++++++++++++++------
openhpi-subagent.spec | 5 +-
2 files changed, 213 insertions(+), 44 deletions(-)
---
diff --git a/openhpi-subagent-2.3.4-format.patch b/openhpi-subagent-2.3.4-format.patch
index 7a9306e..d1ddeaf 100644
--- a/openhpi-subagent-2.3.4-format.patch
+++ b/openhpi-subagent-2.3.4-format.patch
@@ -1,6 +1,6 @@
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c 2009-10-26 11:04:01.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c.format openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
+--- openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -429,7 +429,7 @@ int announcement_add (saHpiAnnouncementT
if (rc != SA_OK) {
DEBUGMSGTL ((AGENT,
@@ -19,21 +19,21 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-suba
oh_lookup_error(rc)));
}
}
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c openhpi-subagent-2.3.4/src/saHpiAreaTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c 2009-10-26 11:04:01.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiAreaTable.c.format openhpi-subagent-2.3.4/src/saHpiAreaTable.c
+--- openhpi-subagent-2.3.4/src/saHpiAreaTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c 2010-11-08 12:47:36.000000000 +0100
@@ -1111,7 +1111,7 @@ void saHpiAreaTable_set_reserve1( netsnm
dri_entry->entry_id++;
} else {
DEBUGMSGTL ((AGENT,"dri_entry->entry_id [%d]\n", dri_entry->entry_id));
- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%d]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
-+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%ld]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
++ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%ld]\n", (long)row_ctx->index.oids[saHpiAreaId_INDEX]));
DEBUGMSGTL ((AGENT,
"ERROR: saHpiAreaTable_set_reserve1() User specified AreaId invalid!!!\n"));
rc = SNMP_ERR_WRONGVALUE;
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c 2009-10-26 11:04:01.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c.format openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
+--- openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -587,7 +587,7 @@ void saHpiAutoInsertTimeoutTable_set_res
rc = SNMP_ERR_WRONGLENGTH;
DEBUGMSGTL ((AGENT,
@@ -43,9 +43,23 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi
}
}
break;
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c 2009-10-26 11:04:01.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c.format 2010-11-08 12:56:53.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c 2010-11-08 12:57:05.000000000 +0100
+@@ -228,8 +228,8 @@ SaErrorT domain_event_log_clear(SaHpiSes
+ DEBUGMSGTL ((AGENT, "domain_event_log_clear, called\n"));
+
+ DEBUGMSGTL ((AGENT, "Attempting to delete domain el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiDomainEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiDomainEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiDomainEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiDomainEventLogTable_oid_len + column_len + 1]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiDomainEventLogTable_oid_len + column_len + 2]-1)));
+ /* BUILD oid for new row */
+diff -up openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c.format openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
+--- openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -350,7 +350,7 @@ int handle_saHpiDomainInfoActiveEntries(
netsnmp_agent_request_info *reqinfo,
netsnmp_request_info *requests)
@@ -55,9 +69,9 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subage
domain_info_entry_count));
/* We are never called for a GETNEXT if it's registered as a
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c 2009-10-26 11:04:01.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c.format openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
+--- openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -220,7 +220,7 @@ handle_saHpiDomainReferenceActiveEntries
netsnmp_request_info *requests)
{
@@ -67,9 +81,9 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-s
domain_reference_entry_count));
domain_reference_entry_count = CONTAINER_SIZE (cb.container);
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c 2009-10-26 11:04:01.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c.format openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
+--- openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -1184,7 +1184,7 @@ void saHpiEventLogInfoTable_set_reserve1
rc = SNMP_ERR_WRONGLENGTH;
DEBUGMSGTL ((AGENT,
@@ -79,21 +93,42 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-suba
}
}
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c openhpi-subagent-2.3.4/src/saHpiFieldTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c 2009-10-26 11:04:01.000000000 +0100
-@@ -1409,7 +1409,7 @@ void saHpiFieldTable_set_reserve1( netsn
+diff -up openhpi-subagent-2.3.4/src/saHpiFieldTable.c.format openhpi-subagent-2.3.4/src/saHpiFieldTable.c
+--- openhpi-subagent-2.3.4/src/saHpiFieldTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c 2010-11-08 12:48:25.000000000 +0100
+@@ -1409,8 +1409,8 @@ void saHpiFieldTable_set_reserve1( netsn
} else {
DEBUGMSGTL ((AGENT,"***********************************************\n"));
DEBUGMSGTL ((AGENT,"dria_entry->entry_id [%d]\n", dria_entry->entry_id));
- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%d]\n",
+- row_ctx->index.oids[saHpiFieldId_field_INDEX]));
+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%ld]\n",
- row_ctx->index.oids[saHpiFieldId_field_INDEX]));
++ (long)row_ctx->index.oids[saHpiFieldId_field_INDEX]));
DEBUGMSGTL ((AGENT,
"ERROR: saHpiFieldTable_set_reserve1() User specified FieldId invalid!!!\n"));
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c 2009-10-26 11:04:01.000000000 +0100
+ DEBUGMSGTL ((AGENT,"***********************************************\n"));
+diff -up openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c.format 2010-11-08 12:53:16.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c 2010-11-08 12:53:33.000000000 +0100
+@@ -229,11 +229,11 @@ SaErrorT hotswap_event_log_clear(SaHpiSe
+
+ DEBUGMSGTL ((AGENT, "hotswap_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete hotswap el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiHotSwapEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Resource [%ld]\n", saHpiEventLogRowPointer[saHpiHotSwapEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiHotSwapEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Resource [%ld]\n", (long)saHpiEventLogRowPointer[saHpiHotSwapEventLogTable_oid_len + column_len + 1]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiHotSwapEventLogTable_oid_len + column_len + 2]-1)));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiHotSwapEventLogTable_oid_len + column_len + 3]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiHotSwapEventLogTable_oid_len + column_len + 3]));
+
+
+ /* BUILD oid to lookup row */
+diff -up openhpi-subagent-2.3.4/src/saHpiHotSwapEventTable.c.format openhpi-subagent-2.3.4/src/saHpiHotSwapEventTable.c
+diff -up openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c.format openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
+--- openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -997,7 +997,7 @@ void saHpiHotSwapTable_set_reserve1( net
rc = SNMP_ERR_WRONGLENGTH;
DEBUGMSGTL ((AGENT,
@@ -103,9 +138,27 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-
}
}
break;
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.4/src/saHpiRdrTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c 2009-10-26 11:04:01.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c.format 2010-11-08 12:54:44.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c 2010-11-08 12:55:03.000000000 +0100
+@@ -241,11 +241,11 @@ SaErrorT oem_event_log_clear(SaHpiSessio
+
+ DEBUGMSGTL ((AGENT, "oem_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete oem el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiOemEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Resource [%ld]\n", saHpiEventLogRowPointer[saHpiOemEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiOemEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Resource [%ld]\n", (long)saHpiEventLogRowPointer[saHpiOemEventLogTable_oid_len + column_len + 1]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiOemEventLogTable_oid_len + column_len + 2]-1)));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiOemEventLogTable_oid_len + column_len + 3]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiOemEventLogTable_oid_len + column_len + 3]));
+
+
+ /* BUILD oid to lookup row */
+diff -up openhpi-subagent-2.3.4/src/saHpiRdrTable.c.format openhpi-subagent-2.3.4/src/saHpiRdrTable.c
+--- openhpi-subagent-2.3.4/src/saHpiRdrTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -492,7 +492,7 @@ int populate_saHpiRdrTable(SaHpiSessionI
rdr_entry_count = CONTAINER_SIZE (cb.container);
@@ -126,9 +179,27 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.
rdr_ctx, row_idx, counter++, rdr_entry_count));
row_idx = CONTAINER_NEXT(cb.container, row_idx);
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent-2.3.4/src/saHpiResourceTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c 2009-10-26 11:04:07.000000000 +0100
+diff -up openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c.format 2010-11-08 12:49:43.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c 2010-11-08 12:50:31.000000000 +0100
+@@ -232,11 +232,11 @@ SaErrorT resource_event_log_clear(SaHpiS
+
+ DEBUGMSGTL ((AGENT, "resource_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete resource el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiResourceEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Resource [%ld]\n", saHpiEventLogRowPointer[saHpiResourceEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiResourceEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Resource [%ld]\n", (long)saHpiEventLogRowPointer[saHpiResourceEventLogTable_oid_len + column_len + 1]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiResourceEventLogTable_oid_len + column_len + 2]-1)));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiResourceEventLogTable_oid_len + column_len + 3]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiResourceEventLogTable_oid_len + column_len + 3]));
+
+ /* BUILD oid to look for row */
+ /* assign the number of indices */
+diff -up openhpi-subagent-2.3.4/src/saHpiResourceTable.c.format openhpi-subagent-2.3.4/src/saHpiResourceTable.c
+--- openhpi-subagent-2.3.4/src/saHpiResourceTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c 2010-11-08 11:36:57.000000000 +0100
@@ -254,8 +254,8 @@ int populate_saHpiResourceTable(SaHpiSes
DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable RptEntry.ResourceTag.DataLength rv = %d\n",
@@ -167,27 +238,122 @@ diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent
resource_entry_count));
/* We are never called for a GETNEXT if it's registered as a
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c 2009-10-26 11:04:01.000000000 +0100
-@@ -1076,7 +1076,7 @@ void saHpiUserEventLogTable_set_reserve1
+diff -up openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c.format 2010-11-08 12:56:16.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c 2010-11-08 12:56:38.000000000 +0100
+@@ -357,12 +357,12 @@ SaErrorT sen_en_change_event_log_clear(S
+
+ DEBUGMSGTL ((AGENT, "sen_en_change_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete sensor el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Resource [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len + 1]));
+- DEBUGMSGTL ((AGENT," Sensor # [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len + 2]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Resource [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Sensor # [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len + 2]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len + 3]-1)));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len + 4]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEnableChangeEventLogTable_oid_len + column_len + 4]));
+
+ /* BUILD oid for new row */
+ /* assign the number of indices */
+diff -up openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c.format 2010-11-08 12:51:09.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c 2010-11-08 12:51:31.000000000 +0100
+@@ -346,12 +346,12 @@ SaErrorT sensor_event_log_clear(SaHpiSes
+
+ DEBUGMSGTL ((AGENT, "sensor_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete sensor el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Resource [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len + 1]));
+- DEBUGMSGTL ((AGENT," Sensor # [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len + 2]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Resource [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Sensor # [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len + 2]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len + 3]-1)));
+- DEBUGMSGTL ((AGENT," Entry Id # [%ld]\n", saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len + 4]));
++ DEBUGMSGTL ((AGENT," Entry Id # [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSensorEventLogTable_oid_len + column_len + 4]));
+
+ /* BUILD oid to lookup row */
+ /* assign the number of indices */
+diff -up openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c.format 2010-11-08 12:54:17.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c 2010-11-08 12:54:32.000000000 +0100
+@@ -245,11 +245,11 @@ SaErrorT software_event_log_clear(SaHpiS
+
+ DEBUGMSGTL ((AGENT, "software_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete software el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiSoftwareEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Resource [%ld]\n", saHpiEventLogRowPointer[saHpiSoftwareEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSoftwareEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Resource [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSoftwareEventLogTable_oid_len + column_len + 1]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiSoftwareEventLogTable_oid_len + column_len + 2]-1)));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiSoftwareEventLogTable_oid_len + column_len + 3]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiSoftwareEventLogTable_oid_len + column_len + 3]));
+
+ /* BUILD oid to lookup row */
+ /* assign the number of indices */
+diff -up openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c 2010-11-08 12:55:57.000000000 +0100
+@@ -241,10 +241,10 @@ SaErrorT user_event_log_clear(SaHpiSessi
+
+ DEBUGMSGTL ((AGENT, "user_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete user el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiUserEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiUserEventLogTable_oid_len + column_len]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiUserEventLogTable_oid_len + column_len + 1]-1)));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiUserEventLogTable_oid_len + column_len + 2]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiUserEventLogTable_oid_len + column_len + 2]));
+
+ /* BUILD oid to lookup row */
+ /* assign the number of indices */
+@@ -1076,8 +1076,8 @@ void saHpiUserEventLogTable_set_reserve1
} else {
DEBUGMSGTL ((AGENT,"***********************************************\n"));
DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%d]\n",
+- row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX]));
+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%ld]\n",
- row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX]));
++ (long)row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX]));
DEBUGMSGTL ((AGENT,
"ERROR: saHpiUserEventLogTable_set_reserve1() "
-diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
---- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c 2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c 2009-10-26 11:04:01.000000000 +0100
-@@ -1158,7 +1158,7 @@ void saHpiUserEventTable_set_reserve1( n
+ "User specified UserEventLogEntryId invalid!!!\n"));
+diff -up openhpi-subagent-2.3.4/src/saHpiUserEventTable.c.format openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
+--- openhpi-subagent-2.3.4/src/saHpiUserEventTable.c.format 2006-09-13 17:41:26.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c 2010-11-08 12:52:26.000000000 +0100
+@@ -1158,8 +1158,8 @@ void saHpiUserEventTable_set_reserve1( n
} else {
DEBUGMSGTL ((AGENT,"***********************************************\n"));
DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%d]\n",
+- row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX]));
+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%ld]\n",
- row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX]));
++ (long)row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX]));
DEBUGMSGTL ((AGENT,
"ERROR: saHpiUserEventTable_set_reserve1() User specified UserEventEntryId invalid!!!\n"));
+ DEBUGMSGTL ((AGENT,"***********************************************\n"));
+diff -up openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c.format openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c
+--- openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c.format 2010-11-08 12:53:45.000000000 +0100
++++ openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c 2010-11-08 12:54:05.000000000 +0100
+@@ -236,12 +236,12 @@ SaErrorT watchdog_event_log_clear(SaHpiS
+
+ DEBUGMSGTL ((AGENT, "watchdog_event_log_clear, called\n"));
+ DEBUGMSGTL ((AGENT, "Attempting to delete watchdog el row with the following indexes:\n"));
+- DEBUGMSGTL ((AGENT," Domain [%ld]\n", saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len]));
+- DEBUGMSGTL ((AGENT," Resource [%ld]\n", saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len + 1]));
+- DEBUGMSGTL ((AGENT," Watchdog# [%ld]\n", saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len + 2]));
++ DEBUGMSGTL ((AGENT," Domain [%ld]\n", (long)saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len]));
++ DEBUGMSGTL ((AGENT," Resource [%ld]\n", (long)saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len + 1]));
++ DEBUGMSGTL ((AGENT," Watchdog# [%ld]\n", (long)saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len + 2]));
+ DEBUGMSGTL ((AGENT," Severity [%s]\n", oh_lookup_severity(
+ saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len + 3]-1)));
+- DEBUGMSGTL ((AGENT," Entry id [%ld]\n", saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len + 4]));
++ DEBUGMSGTL ((AGENT," Entry id [%ld]\n", (long)saHpiEventLogRowPointer[saHpiWatchdogEventLogTable_oid_len + column_len + 4]));
+
+ /* BUILD oid to lookup row */
+ /* assign the number of indices */
diff --git a/openhpi-subagent.spec b/openhpi-subagent.spec
index a2f69fe..23ce7ba 100644
--- a/openhpi-subagent.spec
+++ b/openhpi-subagent.spec
@@ -1,6 +1,6 @@
Name: openhpi-subagent
Version: 2.3.4
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: NetSNMP subagent for OpenHPI
Group: System Environment/Base
@@ -82,6 +82,9 @@ fi
%{_datadir}/snmp/mibs/*.mib
%changelog
+* Mon Nov 8 2010 Dan Horák <dan[at]danny.cz> - 2.3.4-14
+- rebuilt against net-snmp 5.6 and openhpi 2.15
+
* Thu Feb 25 2010 Dan Horák <dan[at]danny.cz> - 2.3.4-13
- updated initscript
More information about the scm-commits
mailing list