Use yp_order() instead of yp_first() in _havemaster() to check for the

presence of the master.passwd.byname map, and remember to free the
returned order value before exiting.

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index c7a4539..1f9b4d6 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -555,14 +555,14 @@ static int
 _havemaster(const char *_pw_yp_domain)
 {
 	char *result;
-	static char *key;
-	int resultlen;
-	static int keylen;
-	
-	if (yp_first(_pw_yp_domain, "master.passwd.byname",
-		      &key, &keylen, &result, &resultlen))
+	int *order;
+
+	if (yp_order(_pw_yp_domain, "master.passwd.byname", &order)) {
+		free(order);
 		return 0;
-	
+	}
+
+	free(order);
 	return 1;
 }