comparison: snmp/snmp.patch
snmp/snmp.patch
- changeset 758
- a2c6460cfb16
- parent 589
- 6db023bc5512
equal
deleted
inserted
replaced
| 3:08c0b81be00d | 4:33da3a827051 |
|---|---|
| 122 + *pid = -1; /* open_persist_pipe ignores return code but checks *pid */ | 122 + *pid = -1; /* open_persist_pipe ignores return code but checks *pid */ |
| 123 + | 123 + |
| 124 /* | 124 /* |
| 125 * Setup our pipes | 125 * Setup our pipes |
| 126 */ | 126 */ |
| 127 Index: agent/mibgroup/host/hrh_filesys.c | |
| 128 diff -Nau agent/mibgroup/host/hrh_filesys.c.orig agent/mibgroup/host/hrh_filesys.c | |
| 129 --- agent/mibgroup/host/hrh_filesys.c.orig 2011-09-28 06:53:47.000000000 +0200 | |
| 130 +++ agent/mibgroup/host/hrh_filesys.c 2012-10-04 14:04:40.672808452 +0200 | |
| 131 @@ -298,9 +298,9 @@ | |
| 132 } else { | |
| 133 HRFS_entry = netsnmp_fsys_get_first(); | |
| 134 } | |
| 135 - /* Skip "inactive" entries */ | |
| 136 - while ( HRFS_entry && !(HRFS_entry->flags & NETSNMP_FS_FLAG_ACTIVE)) | |
| 137 - HRFS_entry = netsnmp_fsys_get_next( HRFS_entry ); | |
| 138 + /* Skip "inactive" entries - Edit: Avoid ignoring ZFS! */ | |
| 139 + /*while ( HRFS_entry && !(HRFS_entry->flags & NETSNMP_FS_FLAG_ACTIVE)) | |
| 140 + HRFS_entry = netsnmp_fsys_get_next( HRFS_entry );*/ | |
| 141 | |
| 142 HRFS_index = (HRFS_entry ? HRFS_entry->idx.oids[0] : -1 ); | |
| 143 return HRFS_index; | |
| 127 Index: agent/snmpd.c | 144 Index: agent/snmpd.c |
| 128 diff -Nau agent/snmpd.c.orig agent/snmpd.c | 145 diff -Nau agent/snmpd.c.orig agent/snmpd.c |
| 129 --- agent/snmpd.c.orig 2011-07-02 00:35:46.000000000 +0200 | 146 --- agent/snmpd.c.orig 2011-07-02 00:35:46.000000000 +0200 |
| 130 +++ agent/snmpd.c 2011-09-15 09:22:41.994430685 +0200 | 147 +++ agent/snmpd.c 2011-09-15 09:22:41.994430685 +0200 |
| 131 @@ -440,7 +440,7 @@ | 148 @@ -440,7 +440,7 @@ |
