Commit 6dbf9cbe authored by Brian Wellington's avatar Brian Wellington
Browse files

596. [bug] DNS_RDATASLAB_FORCE and DNS_RDATASLAB_EXACT are

                        not mutually exclusive.
parent ff74ba92
596. [bug] DNS_RDATASLAB_FORCE and DNS_RDATASLAB_EXACT are
not mutually exclusive.
595. [port] On Linux 2.2, socket() returns EINVAL when it
should return EAFNOSUPPORT. Work around this.
[RT #531]
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdataslab.h,v 1.18 2000/12/01 01:22:45 marka Exp $ */
/* $Id: rdataslab.h,v 1.19 2000/12/06 22:19:05 bwelling Exp $ */
#ifndef DNS_RDATASLAB_H
#define DNS_RDATASLAB_H 1
......@@ -102,8 +102,6 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
unsigned int flags, unsigned char **tslabp);
/*
* Merge 'oslab' and 'nslab'.
*
* DNS_RDATASLAB_FORCE and DNS_RDATASLAB_EXACT are mutually exclusive.
*/
isc_result_t
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdataslab.c,v 1.27 2000/12/01 01:22:42 marka Exp $ */
/* $Id: rdataslab.c,v 1.28 2000/12/06 22:19:04 bwelling Exp $ */
#include <config.h>
......@@ -244,8 +244,6 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
REQUIRE(tslabp != NULL && *tslabp == NULL);
REQUIRE(oslab != NULL && nslab != NULL);
REQUIRE((flags & (DNS_RDATASLAB_FORCE|DNS_RDATASLAB_EXACT)) !=
(DNS_RDATASLAB_FORCE|DNS_RDATASLAB_EXACT));
ocurrent = oslab + reservelen;
ocount = *ocurrent++ * 256;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment