diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-06-29 09:22:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-06-29 09:22:07 +0000 |
| commit | 8db5eb8006e0c27233581ef1c27d7493242567b4 (patch) | |
| tree | 180e4980ba19f1786f95d0f99f8d8498a95d6fdb | |
| parent | 88e6b4142f83ef8a11937a389ae675a7bc957253 (diff) | |
use a union to align the dns answer buffer until gcc4 is fixed
| -rw-r--r-- | lib/libc/net/getrrsetbyname.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/libc/net/getrrsetbyname.c b/lib/libc/net/getrrsetbyname.c index 89aa592ba04..2bbb6ccf83e 100644 --- a/lib/libc/net/getrrsetbyname.c +++ b/lib/libc/net/getrrsetbyname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getrrsetbyname.c,v 1.11 2007/10/11 18:36:41 jakob Exp $ */ +/* $OpenBSD: getrrsetbyname.c,v 1.12 2010/06/29 09:22:06 deraadt Exp $ */ /* * Copyright (c) 2001 Jakob Schlyter. All rights reserved. @@ -53,7 +53,7 @@ #include "thread_private.h" -#define ANSWER_BUFFER_SIZE 1024*64 +#define MAXPACKET 1024*64 struct dns_query { char *name; @@ -105,7 +105,10 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, struct rdatainfo *rdata; int length; unsigned int index_ans, index_sig; - u_char answer[ANSWER_BUFFER_SIZE]; + union { + HEADER hdr; + u_char buf[MAXPACKET]; + } answer; /* check for invalid class and type */ if (rdclass > 0xffff || rdtype > 0xffff) { @@ -143,7 +146,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, /* make query */ length = res_query(hostname, (signed int) rdclass, (signed int) rdtype, - answer, sizeof(answer)); + answer.buf, sizeof(answer.buf)); if (length < 0) { switch(h_errno) { case HOST_NOT_FOUND: @@ -159,7 +162,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, } /* parse result */ - response = parse_dns_response(answer, length); + response = parse_dns_response(answer.buf, length); if (response == NULL) { result = ERRSET_FAIL; goto fail; |