diff options
| author | Kai Blin <kai@samba.org> | 2010-12-06 07:43:35 +0100 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2010-12-08 10:26:00 +0100 |
| commit | af3414feb6cb9f3d4ca602725582220e7b626df3 (patch) | |
| tree | e34ed4ea4637153c6ef28d42eed8f8e451fb494c | |
| parent | 8dd3013208ae02ee4365cd36f0c4688bdc6b46a2 (diff) | |
| download | samba-af3414feb6cb9f3d4ca602725582220e7b626df3.tar.gz samba-af3414feb6cb9f3d4ca602725582220e7b626df3.tar.bz2 samba-af3414feb6cb9f3d4ca602725582220e7b626df3.zip | |
ndr: Another try to support the build on non-IPv6 systems
Signed-off-by: Matthieu Patou <mat@matws.net>
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Wed Dec 8 10:26:00 CET 2010 on sn-devel-104
| -rw-r--r-- | librpc/ndr/ndr_basic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index 96f7323bfd..ff207f4bb9 100644 --- a/librpc/ndr/ndr_basic.c +++ b/librpc/ndr/ndr_basic.c @@ -848,7 +848,6 @@ _PUBLIC_ void ndr_print_ipv4address(struct ndr_print *ndr, const char *name, ndr->print(ndr, "%-25s: %s", name, address); } -#ifdef AF_INET6 /* pull a ipv6address */ @@ -877,6 +876,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ipv6address(struct ndr_pull *ndr, int ndr_fl */ _PUBLIC_ enum ndr_err_code ndr_push_ipv6address(struct ndr_push *ndr, int ndr_flags, const char *address) { +#ifdef AF_INET6 uint8_t addr[IPV6_BYTES]; int ret; @@ -893,6 +893,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ipv6address(struct ndr_push *ndr, int ndr_fl NDR_CHECK(ndr_push_array_uint8(ndr, ndr_flags, addr, IPV6_BYTES)); return NDR_ERR_SUCCESS; +#else + return NDR_ERR_IPV6ADDRESS; +#endif } /* @@ -904,7 +907,6 @@ _PUBLIC_ void ndr_print_ipv6address(struct ndr_print *ndr, const char *name, ndr->print(ndr, "%-25s: %s", name, address); } #undef IPV6_BYTES -#endif _PUBLIC_ void ndr_print_struct(struct ndr_print *ndr, const char *name, const char *type) { |