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)

1 files changed, 3 insertions, 3 deletions

diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c
index 6505e6df3c..8c9eccf424 100644
--- a/source4/utils/nmblookup.c
+++ b/source4/utils/nmblookup.c
@@ -228,7 +228,7 @@ int main(int argc,char *argv[])
     switch (opt)
       {
       case 'B':
-	bcast_addr = *interpret_addr2(optarg);
+	bcast_addr = interpret_addr2(optarg);
 	got_bcast = True;
 	use_bcast = True;
 	break;
@@ -236,7 +236,7 @@ int main(int argc,char *argv[])
 	give_flags = True;
 	break;
       case 'U':
-	bcast_addr = *interpret_addr2(optarg);
+	bcast_addr = interpret_addr2(optarg);
 	got_bcast = True;
 	use_bcast = False;
 	break;
@@ -306,7 +306,7 @@ int main(int argc,char *argv[])
       if(lookup_by_ip)
       {
         fstrcpy(lookup,"*");
-        ip = *interpret_addr2(argv[i]);
+        ip = interpret_addr2(argv[i]);
 	do_node_status(ServerFD, lookup, lookup_type, ip);
         continue;
       }