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/lib/tdr | |
| 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/lib/tdr')
| -rw-r--r-- | source4/lib/tdr/tdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c index 144cfa3e35..8037c6de0a 100644 --- a/source4/lib/tdr/tdr.c +++ b/source4/lib/tdr/tdr.c @@ -203,10 +203,10 @@ NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char * NTSTATUS tdr_pull_ipv4address(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **address) { - struct ipv4_addr in; - TDR_CHECK(tdr_pull_uint32(tdr, ctx, &in.addr)); - in.addr = htonl(in.addr); - *address = talloc_strdup(tdr, sys_inet_ntoa(in)); + struct in_addr in; + TDR_CHECK(tdr_pull_uint32(tdr, ctx, &in.s_addr)); + in.s_addr = htonl(in.s_addr); + *address = talloc_strdup(tdr, inet_ntoa(in)); NT_STATUS_HAVE_NO_MEMORY(*address); return NT_STATUS_OK; } |