[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1415-g8f3a9b3

[Volker Lendecke]

The branch, master has been updated
       via  8f3a9b3c0f32573508424b5480ca077450322ebd (commit)
      from  eea114a8562f71f4aadec76a767a46d7874b8972 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8f3a9b3c0f32573508424b5480ca077450322ebd
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 2 23:34:45 2009 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 librpc/ndr/ndr_basic.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index 825f303..b6cc44c 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;


-- 
Samba Shared Repository