From: Volker Lendecke <vl@samba.org>
Date: Sat, 2 May 2009 17:17:23 +0000 (+0200)
Subject: Fix a warning on host "gwen"
X-Git-Tag: tdb-1.1.5~759
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=eea114a8562f71f4aadec76a767a46d7874b8972;hp=e2052f128f4269692aede0a082351fd0dbea8cce

Fix a warning on host "gwen"

cc: "../librpc/ndr/ndr_basic.c", line 572: warning 604: Pointers are not assignment-compatible.

Apparently in_addr.s_addr is not compatible to uint32_t, maybe a 32-bit signed
int.
---

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