summaryrefslogtreecommitdiffstats
path: root/contrib/bsnmp/snmpd/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/bsnmp/snmpd/config.c')
-rw-r--r--contrib/bsnmp/snmpd/config.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/bsnmp/snmpd/config.c b/contrib/bsnmp/snmpd/config.c
index f6f5c35..ce3a469 100644
--- a/contrib/bsnmp/snmpd/config.c
+++ b/contrib/bsnmp/snmpd/config.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Begemot: bsnmp/snmpd/config.c,v 1.22 2004/08/12 17:09:49 brandt Exp $
+ * $Begemot: bsnmp/snmpd/config.c,v 1.24 2005/10/04 11:21:37 brandt_h Exp $
*
* Parse configuration file.
*/
@@ -820,7 +820,7 @@ parse_oid(const char *varname, struct asn_oid *oid)
while (token == '.') {
if (gettoken() == TOK_NUM) {
if (numval > ASN_MAXID)
- report("subid too large %#"PRIx64, numval);
+ report("subid too large %#"QUADXFMT, numval);
if (oid->len == ASN_MAXOIDLEN)
report("index too long");
oid->subs[oid->len++] = numval;
@@ -863,7 +863,7 @@ parse_syntax_integer(struct snmp_value *value)
if (token != TOK_NUM)
report("bad INTEGER syntax");
if (numval > 0x7fffffff)
- report("INTEGER too large %"PRIu64, numval);
+ report("INTEGER too large %"QUADFMT, numval);
value->v.integer = numval;
gettoken();
@@ -1131,7 +1131,7 @@ parse_define(const char *varname)
m->value = string;
m->length = length;
} else {
- if (t != TOK_ASSIGN) {
+ if (t == TOK_ASSIGN) {
free(m->value);
m->value = string;
m->length = length;
@@ -1360,5 +1360,7 @@ define_macro(const char *name, const char *value)
}
strcpy(m->value, value);
m->length = strlen(value);
+ m->perm = 1;
+ LIST_INSERT_HEAD(&macros, m, link);
return (0);
}
OpenPOWER on IntegriCloud