X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fstatd%2Fnotlist.c;h=0341c159167836661e2d3027279bc7e3a4a86dba;hb=9a5293a10551c03b4fb976503dd24da569fcadb3;hp=98aa6e2fa3a2571871f148cef70e27e284076db7;hpb=2e075a16da4963f54cd556403ca9e15a68de27fd;p=nfs-utils.git

diff --git a/utils/statd/notlist.c b/utils/statd/notlist.c
index 98aa6e2..0341c15 100644
--- a/utils/statd/notlist.c
+++ b/utils/statd/notlist.c
@@ -17,7 +17,6 @@
 #endif
 
 #include <string.h>
-#include "misc.h"
 #include "statd.h"
 #include "notlist.h"
 
@@ -54,19 +53,13 @@ nlist_new(char *my_name, char *mon_name, int state)
 {
 	notify_list	*new;
 
-	if (!(new = (notify_list *) xmalloc(sizeof(notify_list))))
-		return NULL;
+	new = (notify_list *) xmalloc(sizeof(notify_list));
 	memset(new, 0, sizeof(*new));
 
 	NL_TIMES(new) = MAX_TRIES;
 	NL_STATE(new) = state;
-	if (!(NL_MY_NAME(new) = xstrdup(my_name))
-	    || !(NL_MON_NAME(new) = xstrdup(mon_name))) {
-		if (NL_MY_NAME(new))
-			free(NL_MY_NAME(new));
-		free(new);
-		return NULL;
-	}
+	NL_MY_NAME(new) = xstrdup(my_name);
+	NL_MON_NAME(new) = xstrdup(mon_name);
 
 	return new;
 }
@@ -196,7 +189,6 @@ nlist_clone(notify_list *entry)
 	NL_MY_PROG(new) = NL_MY_PROG(entry);
 	NL_MY_VERS(new) = NL_MY_VERS(entry);
 	NL_MY_PROC(new) = NL_MY_PROC(entry);
-	NL_ADDR(new)    = NL_ADDR(entry);
 	memcpy(NL_PRIV(new), NL_PRIV(entry), SM_PRIV_SIZE);
 
 	return new;
@@ -217,6 +209,7 @@ nlist_free(notify_list **head, notify_list *entry)
 		free(NL_MY_NAME(entry));
 	if (NL_MON_NAME(entry))
 		free(NL_MON_NAME(entry));
+	free(entry->dns_name);
 	free(entry);
 }
 
@@ -239,7 +232,8 @@ nlist_gethost(notify_list *list, char *host, int myname)
 	notify_list	*lp;
 
 	for (lp = list; lp; lp = lp->next) {
-		if (matchhostname(host, myname? NL_MY_NAME(lp) : NL_MON_NAME(lp)))
+		if (statd_matchhostname(host,
+				myname? NL_MY_NAME(lp) : NL_MON_NAME(lp)))
 			return lp;
 	}