| From a1ef10d63b0ea34c788d5432e94c72b00ae55e04 Mon Sep 17 00:00:00 2001 |
| From: Joe MacDonald <joe_macdonald@mentor.com> |
| Date: Fri, 27 Feb 2015 12:04:10 -0500 |
| Subject: [PATCH] ipv4/ipv6: Provide an in-place version of mapv4v6addr.h |
| |
| mapv4v6addr.h isn't always available, depending on your build, but |
| nis-hosts.c only needs it for a single, inline function. So drop a copy |
| here rather than playing games with the include path that would |
| potentially lead to cross-compilation issues. |
| |
| Upstream-status: Inappropriate [embedded specific] |
| |
| Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> |
| --- |
| nss_nis6/mapv4v6addr.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ |
| nss_nis6/nis-hosts.c | 2 +- |
| 2 files changed, 70 insertions(+), 1 deletion(-) |
| create mode 100644 nss_nis6/mapv4v6addr.h |
| |
| diff --git a/nss_nis6/mapv4v6addr.h b/nss_nis6/mapv4v6addr.h |
| new file mode 100644 |
| index 0000000..7f85f7d |
| --- /dev/null |
| +++ b/nss_nis6/mapv4v6addr.h |
| @@ -0,0 +1,69 @@ |
| +/* |
| + * ++Copyright++ 1985, 1988, 1993 |
| + * - |
| + * Copyright (c) 1985, 1988, 1993 |
| + * The Regents of the University of California. All rights reserved. |
| + * |
| + * Redistribution and use in source and binary forms, with or without |
| + * modification, are permitted provided that the following conditions |
| + * are met: |
| + * 1. Redistributions of source code must retain the above copyright |
| + * notice, this list of conditions and the following disclaimer. |
| + * 2. Redistributions in binary form must reproduce the above copyright |
| + * notice, this list of conditions and the following disclaimer in the |
| + * documentation and/or other materials provided with the distribution. |
| + * 4. Neither the name of the University nor the names of its contributors |
| + * may be used to endorse or promote products derived from this software |
| + * without specific prior written permission. |
| + * |
| + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
| + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
| + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
| + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
| + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
| + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| + * SUCH DAMAGE. |
| + * - |
| + * Portions Copyright (c) 1993 by Digital Equipment Corporation. |
| + * |
| + * Permission to use, copy, modify, and distribute this software for any |
| + * purpose with or without fee is hereby granted, provided that the above |
| + * copyright notice and this permission notice appear in all copies, and that |
| + * the name of Digital Equipment Corporation not be used in advertising or |
| + * publicity pertaining to distribution of the document or software without |
| + * specific, written prior permission. |
| + * |
| + * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL |
| + * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES |
| + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT |
| + * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL |
| + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR |
| + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS |
| + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS |
| + * SOFTWARE. |
| + * - |
| + * --Copyright-- |
| + */ |
| + |
| +#include <string.h> |
| +#include <arpa/nameser.h> |
| + |
| +static void |
| +map_v4v6_address (const char *src, char *dst) |
| +{ |
| + u_char *p = (u_char *) dst; |
| + int i; |
| + |
| + /* Move the IPv4 part to the right position. */ |
| + memcpy (dst + 12, src, INADDRSZ); |
| + |
| + /* Mark this ipv6 addr as a mapped ipv4. */ |
| + for (i = 0; i < 10; i++) |
| + *p++ = 0x00; |
| + *p++ = 0xff; |
| + *p = 0xff; |
| +} |
| diff --git a/nss_nis6/nis-hosts.c b/nss_nis6/nis-hosts.c |
| index af99c74..96d8fa1 100644 |
| --- a/nss_nis6/nis-hosts.c |
| +++ b/nss_nis6/nis-hosts.c |
| @@ -36,7 +36,7 @@ |
| #include "nss-nis6.h" |
| |
| /* Get implementation for some internal functions. */ |
| -#include <resolv/mapv4v6addr.h> |
| +#include "mapv4v6addr.h" |
| |
| #define ENTNAME hostent |
| #define DATABASE "hosts" |
| -- |
| 1.9.1 |
| |