1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

Of course, s_addr is a #define somewhere else .... (Solaris...)

This commit is contained in:
Volker Lendecke 2009-05-02 23:34:45 +02:00
parent eea114a856
commit 8f3a9b3c0f

View File

@ -568,10 +568,10 @@ _PUBLIC_ enum ndr_err_code ndr_pull_time_t(struct ndr_pull *ndr, int ndr_flags,
*/ */
_PUBLIC_ enum ndr_err_code ndr_pull_ipv4address(struct ndr_pull *ndr, int ndr_flags, const char **address) _PUBLIC_ enum ndr_err_code ndr_pull_ipv4address(struct ndr_pull *ndr, int ndr_flags, const char **address)
{ {
uint32_t s_addr; uint32_t addr;
struct in_addr in; struct in_addr in;
NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &s_addr)); NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &addr));
in.s_addr = htonl(s_addr); in.s_addr = htonl(addr);
*address = talloc_strdup(ndr->current_mem_ctx, inet_ntoa(in)); *address = talloc_strdup(ndr->current_mem_ctx, inet_ntoa(in));
NDR_ERR_HAVE_NO_MEMORY(*address); NDR_ERR_HAVE_NO_MEMORY(*address);
return NDR_ERR_SUCCESS; return NDR_ERR_SUCCESS;