The branch, master has been updated
via eea114a8562f71f4aadec76a767a46d7874b8972 (commit)
from e2052f128f4269692aede0a082351fd0dbea8cce (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit eea114a8562f71f4aadec76a767a46d7874b8972
Author: Volker Lendecke <[email protected]>
Date: Sat May 2 19:17:23 2009 +0200
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.
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/ndr_basic.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index 97f7505..825f303 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;
--
Samba Shared Repository
