From 370b69af0f9c5e049d8c05e1593fc5f22ea3b64e Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sun, 29 May 2016 06:29:22 +0000
Subject: [PATCH] Remove unnecessary caller_uaddr != NULL test before calling
 free on it

MFC after: 3 days
Sponsored by: EMC / Isilon Storage Division
---
 usr.sbin/rpcbind/util.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index 8cf7a6e0354d..814a379679af 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -293,8 +293,7 @@ addrmerge(struct netbuf *caller, const char *serv_uaddr, const char *clnt_uaddr,
 	ret = taddr2uaddr(nconf, &tbuf);
 
 freeit:
-	if (caller_uaddr != NULL)
-		free(caller_uaddr);
+	free(caller_uaddr);
 	if (hint_nbp != NULL) {
 		free(hint_nbp->buf);
 		free(hint_nbp);