From 9d055846f225bea4953822f40fab1d2f1a2e2d07 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 27 Oct 2004 03:15:42 +0000 Subject: r3278: - rewrote the client side rpc connection code to use lib/socket/ rather than doing everything itself. This greatly simplifies the code, although I really don't like the socket_recv() interface (it always allocates memory for you, which means an extra memcpy in this code) - fixed several bugs in the socket_ipv4.c code, in particular client side code used a non-blocking connect but didn't handle EINPROGRESS, so it had no chance of working. Also fixed the error codes, using map_nt_error_from_unix() - cleaned up and expanded map_nt_error_from_unix() - changed interpret_addr2() to not take a mem_ctx. It makes absolutely no sense to allocate a fixed size 4 byte structure like this. Dozens of places in the code were also using interpret_addr2() incorrectly (precisely because the allocation made no sense) (This used to be commit 7f2c771b0e0e98c5c9e5cf662592d64d34ff1205) --- source4/libcli/namequery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/libcli/namequery.c') diff --git a/source4/libcli/namequery.c b/source4/libcli/namequery.c index de0f406209..0f21e33b85 100644 --- a/source4/libcli/namequery.c +++ b/source4/libcli/namequery.c @@ -522,7 +522,7 @@ BOOL getlmhostsent( TALLOC_CTX *mem_ctx, continue; } - *ipaddr = *interpret_addr2(mem_ctx, ip); + *ipaddr = interpret_addr2(ip); /* Extra feature. If the name ends in '#XX', where XX is a hex number, then only add that name type. */ @@ -643,7 +643,7 @@ BOOL resolve_wins(TALLOC_CTX *mem_ctx, const char *name, int name_type, } /* the address we will be sending from */ - src_ip = *interpret_addr2(mem_ctx, lp_socket_address()); + src_ip = interpret_addr2(lp_socket_address()); /* in the worst case we will try every wins server with every tag! */ @@ -900,7 +900,7 @@ BOOL resolve_name(TALLOC_CTX *mem_ctx, const char *name, struct in_addr *return_ int count = 0; if (is_ipaddress(name)) { - *return_ip = *interpret_addr2(mem_ctx, name); + *return_ip = interpret_addr2(name); return True; } -- cgit