3 @@ -8757,13 +8757,13 @@ _ACEOF
7 -echo "$as_me:$LINENO: checking for init_snmp in -lsnmp" >&5
8 -echo $ECHO_N "checking for init_snmp in -lsnmp... $ECHO_C" >&6
9 +echo "$as_me:$LINENO: checking for init_snmp in -lnetsnmp" >&5
10 +echo $ECHO_N "checking for init_snmp in -lnetsnmp... $ECHO_C" >&6
11 if test "${ac_cv_lib_snmp_init_snmp+set}" = set; then
12 echo $ECHO_N "(cached) $ECHO_C" >&6
14 ac_check_lib_save_LIBS=$LIBS
16 +LIBS="-lnetsnmp $LIBS"
17 cat >conftest.$ac_ext <<_ACEOF
18 #line $LINENO "configure"
20 @@ -8816,7 +8816,7 @@ if test $ac_cv_lib_snmp_init_snmp = yes;
21 #define HAVE_LIBSNMP 1
25 + LIBS="-lnetsnmp $LIBS"
28 { { echo "$as_me:$LINENO: error: Couldn't find libsnmp" >&5
29 @@ -9291,7 +9291,7 @@ fi
33 -for PYTHONINCPATH in python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
34 +for PYTHONINCPATH in python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
36 as_ac_Header=`echo "ac_cv_header_$PYTHONINCPATH/Python.h" | $as_tr_sh`
37 if eval "test \"\${$as_ac_Header+set}\" = set"; then
41 -*** /usr/include/net-snmp/library/mib.h 2003-11-11 08:37:02.000000000 -0800
42 ---- mib.h 2004-03-07 14:59:47.000000000 -0800
45 - int get_wild_node(const char *, oid *, size_t *);
46 - int get_node(const char *, oid *, size_t *);
47 - oid *snmp_parse_oid(const char *, oid *, size_t *);
48 -! struct tree *get_symbol(oid *, size_t, struct tree *, char *);
49 - struct tree *get_tree(const oid *, size_t, struct tree *);
50 - struct tree *get_tree_head(void);
51 - void set_function(struct tree *);
53 - int get_wild_node(const char *, oid *, size_t *);
54 - int get_node(const char *, oid *, size_t *);
55 - oid *snmp_parse_oid(const char *, oid *, size_t *);
56 -! /* struct tree *get_symbol(oid *, size_t, struct tree *, char *);*/
57 - struct tree *get_tree(const oid *, size_t, struct tree *);
58 - struct tree *get_tree_head(void);
59 - void set_function(struct tree *);
62 - const char *parse_octet_hint(const char *hint, const char *value,
63 - unsigned char **new_val, int *new_val_len);
65 -! void clear_tree_flags(register struct tree *tp);
67 - char *snmp_out_toggle_options(char *);
68 - void snmp_out_toggle_options_usage(const char *, FILE *);
70 - const char *parse_octet_hint(const char *hint, const char *value,
71 - unsigned char **new_val, int *new_val_len);
73 -! /* void clear_tree_flags(register struct tree *tp);*/
75 - char *snmp_out_toggle_options(char *);
76 - void snmp_out_toggle_options_usage(const char *, FILE *);
77 +--- mib.h.old 2007-07-19 15:11:03.917123577 -0500
78 ++++ mib.h 2007-07-19 15:10:44.804034380 -0500
80 + const char *parse_octet_hint(const char *hint, const char *value,
81 + unsigned char **new_val, int *new_val_len);
83 +- void clear_tree_flags(register struct tree *tp);
84 ++ /* void clear_tree_flags(register struct tree *tp); */
86 + char *snmp_out_toggle_options(char *);
87 + void snmp_out_toggle_options_usage(const char *, FILE *);
88 --- a/src/snmp_api.h-patch
89 +++ b/src/snmp_api.h-patch
91 -*** /usr/include/net-snmp/library/snmp_api.h 2003-11-11 08:37:07.000000000 -0800
92 ---- snmp_api.h 2004-03-07 15:02:18.000000000 -0800
97 - * The actual transport domain. This SHOULD NOT BE FREE()D.
100 - const oid *tDomain;
103 - netsnmp_variable_list *variables;
108 - * The actual transport domain. This SHOULD NOT BE FREE()D.
110 - const oid *tDomain;
114 - netsnmp_variable_list *variables;
119 - * Authentication function or NULL if null authentication is used
121 -! u_char *(*authenticator) (u_char *, size_t *, u_char *, size_t);
122 - netsnmp_callback callback; /* Function to interpret incoming data */
124 - * Pointer to data that the callback function may consider important
127 - * Authentication function or NULL if null authentication is used
129 -! /* u_char *(*authenticator) (u_char *, size_t *, u_char *, size_t);*/
130 - netsnmp_callback callback; /* Function to interpret incoming data */
132 - * Pointer to data that the callback function may consider important
137 - #define SNMPERR_MAX (-63)
140 - #define non_repeaters errstat
141 - #define max_repetitions errindex
144 - struct variable_list {
145 - struct variable_list *next_variable; /* NULL for last variable */
148 - oid name_loc[MAX_OID_LEN]; /* 90 percentile < 24. */
149 - u_char buf[40]; /* 90 percentile < 40. */
150 - void *data; /* (Opaque) hook for additional data */
151 -! void (*dataFreeHook)(void *); /* callback to free above */
156 - oid name_loc[MAX_OID_LEN]; /* 90 percentile < 24. */
157 - u_char buf[40]; /* 90 percentile < 40. */
158 - void *data; /* (Opaque) hook for additional data */
159 -! /* void (*dataFreeHook)(void *); */ /* callback to free above */
166 - int netsnmp_oid_equals(const oid *, size_t, const oid *,
168 -! int netsnmp_oid_tree_equals(const oid *, size_t, const oid *,
170 - int netsnmp_oid_is_subtree(const oid *, size_t, const oid *,
172 - int netsnmp_oid_find_prefix(const oid * in_name1, size_t len1,
175 - int netsnmp_oid_equals(const oid *, size_t, const oid *,
177 -! /* int netsnmp_oid_tree_equals(const oid *, size_t, const oid *,
179 - int netsnmp_oid_is_subtree(const oid *, size_t, const oid *,
181 - int netsnmp_oid_find_prefix(const oid * in_name1, size_t len1,
185 +--- snmp_api.h.orig Fri Jan 7 17:06:46 2005
186 ++++ snmp_api.h Fri Jan 7 17:10:01 2005
187 +@@ -112,10 +112,10 @@
190 + * The actual transport domain. This SHOULD NOT BE FREE()D.
193 + const oid *tDomain;
197 + netsnmp_variable_list *variables;
201 + * Authentication function or NULL if null authentication is used
203 +- u_char *(*authenticator) (u_char *, size_t *, u_char *, size_t);
204 ++ /* u_char *(*authenticator) (u_char *, size_t *, u_char *, size_t); */
205 + /** Function to interpret incoming data */
206 + netsnmp_callback callback;
208 +@@ -487,8 +487,10 @@
210 + #define SNMPERR_MAX (-63)
213 + #define non_repeaters errstat
214 + #define max_repetitions errindex
220 + /** (Opaque) hook for additional data */
222 + /** callback to free above */
223 +- void (*dataFreeHook)(void *);
224 ++ /* void (*dataFreeHook)(void *); */
230 + int netsnmp_oid_equals(const oid *, size_t, const oid *,
232 +- int netsnmp_oid_tree_equals(const oid *, size_t, const oid *,
234 ++/* int netsnmp_oid_tree_equals(const oid *, size_t, const oid *,
236 + int netsnmp_oid_is_subtree(const oid *, size_t, const oid *,
238 + int netsnmp_oid_find_prefix(const oid * in_name1, size_t len1,
239 +@@ -739,11 +741,13 @@
240 + size_t * out_length,
242 + size_t pdu_data_len);
244 + int snmpv3_packet_rbuild(netsnmp_session *,
245 + netsnmp_pdu *pdu, u_char * packet,
248 size_t pdu_data_len);
250 - int snmpv3_packet_rbuild(netsnmp_session *,
251 - netsnmp_pdu *pdu, u_char * packet,
252 - size_t * out_length,
254 - size_t pdu_data_len);
256 - int snmpv3_make_report(netsnmp_pdu *pdu, int error);
257 - int snmpv3_get_report_type(netsnmp_pdu *pdu);
258 - int snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data,
262 - * Extended open; fpre_parse has changed.
266 - netsnmp_session *snmp_open_ex(netsnmp_session *,
267 - int (*fpre_parse) (netsnmp_session *,
272 - netsnmp_pdu *, u_char **,
273 - size_t *, size_t *),
274 - int (*fcheck) (u_char *, size_t));
278 - * provided for backwards compatability. Don't use these functions.
286 - void *snmp_sess_add_ex(netsnmp_session *,
287 - struct netsnmp_transport_s *,
288 - int (*fpre_parse) (netsnmp_session *,
298 - * use return value from snmp_sess_open as void * parameter
300 + int snmpv3_make_report(netsnmp_pdu *pdu, int error);
301 + int snmpv3_get_report_type(netsnmp_pdu *pdu);
302 + int snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data,
304 + * Extended open; fpre_parse has changed.
308 + netsnmp_session *snmp_open_ex(netsnmp_session *,
309 + int (*fpre_parse) (netsnmp_session *,
312 + netsnmp_pdu *, u_char **,
313 + size_t *, size_t *),
314 + int (*fcheck) (u_char *, size_t));
318 + * provided for backwards compatability. Don't use these functions.
324 + void *snmp_sess_add_ex(netsnmp_session *,
325 + struct netsnmp_transport_s *,
326 + int (*fpre_parse) (netsnmp_session *,
334 + * use return value from snmp_sess_open as void * parameter