diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-13 20:24:37 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:00 +0100 |
| commit | b09047b78e981af8ade6a72d426bfcb0e742995b (patch) | |
| tree | 2547a72c9814f190d83cb0f8ecac678976a72ff5 /source4/librpc/ndr | |
| parent | 8517878144973aa23e653bfc7aabfbaef500c7e2 (diff) | |
| download | samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.gz samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.bz2 samba-b09047b78e981af8ade6a72d426bfcb0e742995b.zip | |
r25624: Remove ipv4_addr hack. Only causes 4 extra includes of system/network.h because we stripped down includes.
(This used to be commit 262c1c23a61f1f4fae13e0a61179fe98b682cecf)
Diffstat (limited to 'source4/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 2 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 8 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_misc.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index d110a25aeb..64d5da44f9 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -329,7 +329,7 @@ NTSTATUS ndr_push_dom_sid28(struct ndr_push *ndr, int ndr_flags, const struct do NTSTATUS ndr_pull_dom_sid28(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid); void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid); size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags); -void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct ipv4_addr *_ip); +void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip); void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid); #endif /* __LIBNDR_H__ */ diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index c0a021e677..a26b67af22 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -585,10 +585,10 @@ _PUBLIC_ NTSTATUS ndr_pull_time_t(struct ndr_pull *ndr, int ndr_flags, time_t *t */ _PUBLIC_ NTSTATUS ndr_pull_ipv4address(struct ndr_pull *ndr, int ndr_flags, const char **address) { - struct ipv4_addr in; - NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &in.addr)); - in.addr = htonl(in.addr); - *address = talloc_strdup(ndr->current_mem_ctx, sys_inet_ntoa(in)); + struct in_addr in; + NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &in.s_addr)); + in.s_addr = htonl(in.s_addr); + *address = talloc_strdup(ndr->current_mem_ctx, inet_ntoa(in)); NT_STATUS_HAVE_NO_MEMORY(*address); return NT_STATUS_OK; } diff --git a/source4/librpc/ndr/ndr_misc.c b/source4/librpc/ndr/ndr_misc.c index a3d34643a1..be7dab93d2 100644 --- a/source4/librpc/ndr/ndr_misc.c +++ b/source4/librpc/ndr/ndr_misc.c @@ -24,13 +24,13 @@ #include "system/network.h" #include "librpc/ndr/libndr.h" -_PUBLIC_ void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct ipv4_addr *_ip) +_PUBLIC_ void ndr_print_in_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip) { - struct ipv4_addr ip; + struct in_addr ip; - ip.addr = htonl(_ip->addr); + ip.s_addr = htonl(_ip->s_addr); - ndr->print(ndr, "%-25s: %s", name, sys_inet_ntoa(ip)); + ndr->print(ndr, "%-25s: %s", name, inet_ntoa(ip)); } _PUBLIC_ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid) |