[src/trunk]: src/usr.sbin/rpcbind For the local case, return serv_uaddr in ad...

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9730702b5a57
branches:  trunk
changeset: 509226:9730702b5a57
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Mon Apr 30 00:36:07 2001 +0000

description:
For the local case, return serv_uaddr in addrmerge, not the address
by which the client contacted rpcbind.

Also fix a missing \n in a debug printf.

>From Martin Blapp, mb%imp.ch@localhost

diffstat:

 usr.sbin/rpcbind/rpcb_svc_4.c |  4 ++--
 usr.sbin/rpcbind/util.c       |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r d21a2db85f40 -r 9730702b5a57 usr.sbin/rpcbind/rpcb_svc_4.c
--- a/usr.sbin/rpcbind/rpcb_svc_4.c     Mon Apr 30 00:25:09 2001 +0000
+++ b/usr.sbin/rpcbind/rpcb_svc_4.c     Mon Apr 30 00:36:07 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpcb_svc_4.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $      */
+/*     $NetBSD: rpcb_svc_4.c,v 1.2 2001/04/30 00:36:07 fvdl Exp $      */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -359,7 +359,7 @@
                }
 #ifdef RPCBIND_DEBUG
                if (debugging)
-                       fprintf(stderr, "\tmerge with: %s", rbl->rpcb_map.r_addr);
+                       fprintf(stderr, "\tmerge with: %s\n", rbl->rpcb_map.r_addr);
 #endif
                if ((maddr = mergeaddr(transp, rbl->rpcb_map.r_netid,
                                rbl->rpcb_map.r_addr, saddr)) == NULL) {
diff -r d21a2db85f40 -r 9730702b5a57 usr.sbin/rpcbind/util.c
--- a/usr.sbin/rpcbind/util.c   Mon Apr 30 00:25:09 2001 +0000
+++ b/usr.sbin/rpcbind/util.c   Mon Apr 30 00:36:07 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.6 2001/04/22 21:43:05 fvdl Exp $    */
+/*     $NetBSD: util.c,v 1.7 2001/04/30 00:36:08 fvdl Exp $    */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -153,7 +153,7 @@
                        free(serv_nbp);
                        free(clnt_nbp);
                        free(clnt_sa);
-                       return strdup(clnt_uaddr);
+                       return strdup(serv_uaddr);
                }
        } else {
                clnt_sa = (struct sockaddr *)