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;
 }
 
 
@@ -90,8 +85,8 @@ sgetsgent_r(size_t size;
 	if (STRSEP2ARR(p, ":", fields) == -1)
 		return EINVAL;
 
-	sgent->sg_namp = fields[0];
-	sgent->sg_passwd = fields[1];
+	sgroup.sg_namp = fields[0];
+	sgroup.sg_passwd = fields[1];
 
 	if (!is_aligned(buf, char *))
 		return EINVAL;
@@ -102,7 +97,7 @@ sgetsgent_r(size_t size;
 	if (csv2ls(fields[2], nadm, sgent->sg_adm) == -1)
 		return errno;
 
-	sgent->sg_mem = sgent->sg_adm + nadm;
+	sgroup.sg_mem = sgroup.sg_adm + nadm;
 	nmem = strchrcnt(fields[3], ',') + 2;
 	if (nmem + nadm > n)
 		return E2BIG;

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 = {};
 
 	size_t  size;
 
@@ -44,18 +44,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 spwd;
 
 	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
 
@@ -91,8 +86,8 @@ sgetspent_r(size_t size;
 	if (i != countof(fields) && i != OFIELDS)
 		return EINVAL;
 
-	spent->sp_namp = fields[0];
-	spent->sp_pwdp = fields[1];
+	spwd.sp_namp = fields[0];
+	spwd.sp_pwdp = fields[1];
 
 	if (streq(fields[2], ""))
 		spent->sp_lstchg = -1;
@@ -115,10 +110,10 @@ sgetspent_r(size_t size;
 		 * /etc/shadow formatted file.  Initialize the other
 		 * field members to -1.
 		 */
-		spent->sp_warn   = -1;
-		spent->sp_inact  = -1;
-		spent->sp_expire = -1;
-		spent->sp_flag   = SHADOW_SP_FLAG_UNSET;
+		spwd.sp_warn   = -1;
+		spwd.sp_inact  = -1;
+		spwd.sp_expire = -1;
+		spwd.sp_flag   = SHADOW_SP_FLAG_UNSET;
 
 		return 0;
 	}