Revert "lib/shadow/: Allocate the structure"

This reverts HEAD^^ (2025-09-29; "lib/shadow/: Allocate the structure").

That change was temporary to allow adding a re-entrant variant of the
function with a small diff.  Remove it now that it's done.  We don't
want to be allocating more than necessary.

Signed-off-by: Alejandro Colomar <[email protected]>

Author: alejandro-colomar

lib/shadow/group/sgetgrent.c

@@ -32,33 +32,28 @@ struct group *
 sgetgrent(const char *s)
 {
 	static char          *buf = NULL;
-	static struct group  *grent = NULL;
+	static struct group  grent = {};
 
 	int     e;
 	char    *p, *end;
 	size_t  n, lssize, size;
 
 	n = strchrcnt(s, ',') + 2;
-	lssize = n * sizeof(char *);  // For 'grent->gr_mem'.
+	lssize = n * sizeof(char *);  // For 'grent.gr_mem'.
 	size = lssize + strlen(s) + 1;
 
 	free(buf);
 	buf = MALLOC(size, char);
 	if (buf == NULL)
 		return NULL;
 
-	free(grent);
-	grent = MALLOC(1, struct group);
-	if (grent == NULL)
-		return NULL;
-
-	e = sgetgrent_r(s, grent, buf, size);
+	e = sgetgrent_r(s, &grent, buf, size);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return grent;
+	return &grent;
 }
 
 

lib/shadow/gshadow/sgetsgent.c

@@ -33,33 +33,28 @@ struct sgrp *
 sgetsgent(const char *s)
 {
 	static char         *buf = NULL;
-	static struct sgrp  *sgent = NULL;
+	static struct sgrp  sgent = {};
 
 	int     e;
 	char    *p, *end;
 	size_t  n, nadm, nmem, lssize, size;
 
 	n = strchrcnt(s, ',') + 4;
-	lssize = n * sizeof(char *);  // For 'sgent->sg_adm' and 'sgent->sg_mem'
+	lssize = n * sizeof(char *);  // For 'sgent.sg_adm' and 'sgent.sg_mem'
 	size = lssize + strlen(s) + 1;
 
 	free(buf);
 	buf = MALLOC(size, char);
 	if (buf == NULL)
 		return NULL;
 
-	free(sgent);
-	sgent = MALLOC(1, struct sgrp);
-	if (sgent == NULL)
-		return NULL;
-
-	e = sgetsgent_r(s, sgent, buf, size);
+	e = sgetsgent_r(s, &sgent, buf, size);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return sgent;
+	return &sgent;
 }
 
 

lib/shadow/passwd/sgetpwent.c

@@ -33,7 +33,7 @@ struct passwd *
 sgetpwent(const char *s)
 {
 	static char           *buf = NULL;
-	static struct passwd  *pwent = NULL;
+	static struct passwd  pwent = {};
 
 	int     e;
 	size_t  size;
@@ -45,18 +45,13 @@ sgetpwent(const char *s)
 	if (buf == NULL)
 		return NULL;
 
-	free(pwent);
-	pwent = MALLOC(1, struct passwd);
-	if (pwent == NULL)
-		return NULL;
-
-	e = sgetpwent_r(s, pwent, buf, size);
+	e = sgetpwent_r(s, &pwent, buf, size);
 	if (e != 0)
 		errno = e;
 		return NULL;
 	}
 
-	return pwent;
+	return &pwent;
 }
 
 

lib/shadow/shadow/sgetspent.c

@@ -38,7 +38,7 @@ struct spwd *
 sgetspent(const char *s)
 {
 	static char         *buf = NULL;
-	static struct spwd  *spent = NULL;
+	static struct spwd  spent = {};
 
 	int     e;
 	size_t  size;
@@ -50,18 +50,13 @@ sgetspent(const char *s)
 	if (buf == NULL)
 		return NULL;
 
-	free(spent);
-	spent = MALLOC(1, struct spwd);
-	if (spent == NULL)
-		return NULL;
-
-	e = sgetspent_r(s, spent, buf, size, dummy);
+	e = sgetspent_r(s, &spent, buf, size, dummy);
 	if (e != 0) {
 		errno = e;
 		return NULL;
 	}
 
-	return spent;
+	return &spent;
 }
 #endif