From: Volker Lendecke <vl@samba.org>
Date: Sat, 2 May 2009 21:34:45 +0000 (+0200)
Subject: Of course, s_addr is a #define somewhere else .... (Solaris...)
X-Git-Tag: tdb-1.1.5~758
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f3a9b3c0f32573508424b5480ca077450322ebd;p=thirdparty%2Fsamba.git

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

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index 825f30319ec..b6cc44cc325 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -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)
 {
-	uint32_t s_addr;
+	uint32_t addr;
 	struct in_addr in;
-	NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &s_addr));
-	in.s_addr = htonl(s_addr);
+	NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &addr));
+	in.s_addr = htonl(addr);
 	*address = talloc_strdup(ndr->current_mem_ctx, inet_ntoa(in));
 	NDR_ERR_HAVE_NO_MEMORY(*address);
 	return NDR_ERR_SUCCESS;