diff options
author | David Hankins <dhankins@isc.org> | 2006-02-24 23:16:32 +0000 |
---|---|---|
committer | David Hankins <dhankins@isc.org> | 2006-02-24 23:16:32 +0000 |
commit | 88cd8aca9efa1e5b867ac498b98e972638f7aee8 (patch) | |
tree | 8d3015eda99ca77265ed79d15b6e1f0200f6bab3 /omapip/buffer.c | |
parent | b43c87ad595026da002f7acca54bf24318d9fed2 (diff) | |
download | isc-dhcp-88cd8aca9efa1e5b867ac498b98e972638f7aee8.tar.gz |
- Merge changes between 3.0.3RC1 and 3.0.4-BETA-3 into HEAD (silence
robie).
Diffstat (limited to 'omapip/buffer.c')
-rw-r--r-- | omapip/buffer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/omapip/buffer.c b/omapip/buffer.c index 74f53dae..6b751eff 100644 --- a/omapip/buffer.c +++ b/omapip/buffer.c @@ -3,7 +3,7 @@ Buffer access functions for the object management protocol... */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1999-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -154,10 +154,6 @@ static isc_result_t omapi_connection_reader_trace (omapi_object_t *h, return ISC_R_INVALIDARG; c = (omapi_connection_object_t *)h; - /* Make sure c -> bytes_needed is valid. */ - if (c -> bytes_needed < 0) - return ISC_R_INVALIDARG; - /* See if there are enough bytes. */ if (c -> in_bytes >= OMAPI_BUF_SIZE - 1 && c -> in_bytes > c -> bytes_needed) |