summaryrefslogtreecommitdiff
path: root/usr.sbin/syslogd
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2013-11-09 18:58:22 +0000
committerchristos <christos@NetBSD.org>2013-11-09 18:58:22 +0000
commitefb89846e711e515cb57e333bf3f72f63e3b80bb (patch)
treef300c946da099ffa0c40a831768afea0e0e69172 /usr.sbin/syslogd
parent4df5163a38a67bcf4f85b363f77cca7d43bfe332 (diff)
fix two bugs related to queues (Anthony Mallet)
- the default values are in humanized number form so strtol does not work - fix reversed size tests
Diffstat (limited to 'usr.sbin/syslogd')
-rw-r--r--usr.sbin/syslogd/syslogd.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 92d0c965dff..62774309bbe 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.115 2013/05/27 23:15:51 christos Exp $ */
+/* $NetBSD: syslogd.c,v 1.116 2013/11/09 18:58:22 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.115 2013/05/27 23:15:51 christos Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.116 2013/11/09 18:58:22 christos Exp $");
#endif
#endif /* not lint */
@@ -3143,13 +3143,13 @@ read_config_file(FILE *cf, struct filed **f_ptr)
if (!TypeInfo[i].queue_length_string
|| dehumanize_number(TypeInfo[i].queue_length_string,
&TypeInfo[i].queue_length) == -1)
- TypeInfo[i].queue_length = strtol(
- TypeInfo[i].default_length_string, NULL, 10);
+ dehumanize_number(TypeInfo[i].default_length_string,
+ &TypeInfo[i].queue_length);
if (!TypeInfo[i].queue_size_string
|| dehumanize_number(TypeInfo[i].queue_size_string,
&TypeInfo[i].queue_size) == -1)
- TypeInfo[i].queue_size = strtol(
- TypeInfo[i].default_size_string, NULL, 10);
+ dehumanize_number(TypeInfo[i].default_size_string,
+ &TypeInfo[i].queue_size);
}
#ifndef DISABLE_SIGN
@@ -4366,9 +4366,9 @@ message_queue_purge(struct filed *f, size_t del_entries, int strategy)
while (removed < del_entries
|| (TypeInfo[f->f_type].queue_length != -1
- && (size_t)TypeInfo[f->f_type].queue_length > f->f_qelements)
+ && (size_t)TypeInfo[f->f_type].queue_length <= f->f_qelements)
|| (TypeInfo[f->f_type].queue_size != -1
- && (size_t)TypeInfo[f->f_type].queue_size > f->f_qsize)) {
+ && (size_t)TypeInfo[f->f_type].queue_size <= f->f_qsize)) {
qentry = find_qentry_to_delete(&f->f_qhead, strategy, 0);
if (message_queue_remove(f, qentry))
removed++;