diff options
| author | Volker Lendecke <vl@samba.org> | 2009-05-02 23:34:45 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-05-02 23:35:30 +0200 |
| commit | 8f3a9b3c0f32573508424b5480ca077450322ebd (patch) | |
| tree | 61833999742441b175650f1251db48cec48ee57d | |
| parent | eea114a8562f71f4aadec76a767a46d7874b8972 (diff) | |
| download | samba-8f3a9b3c0f32573508424b5480ca077450322ebd.tar.gz samba-8f3a9b3c0f32573508424b5480ca077450322ebd.tar.bz2 samba-8f3a9b3c0f32573508424b5480ca077450322ebd.zip | |
Of course, s_addr is a #define somewhere else .... (Solaris...)
| -rw-r--r-- | librpc/ndr/ndr_basic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index 825f30319e..b6cc44cc32 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; |