Add sgetXXent_r() thread-safe variant functions

configure.ac

@@ -63,7 +63,7 @@ AC_CHECK_MEMBERS([struct utmpx.ut_name,
 dnl Checks for library functions.
 AC_FUNC_UTIME_NULL
 AC_REPLACE_FUNCS([putgrent putpwent putspent])
-AC_REPLACE_FUNCS([sgetgrent sgetpwent sgetspent])
+AC_REPLACE_FUNCS([sgetgrent sgetpwent sgetspent sgetspent_r])
 
 AC_CHECK_FUNC([setpgrp])
 AC_CHECK_FUNC([secure_getenv],

lib/Makefile.am

@@ -121,6 +121,7 @@ libshadow_la_SOURCES = \
 	isexpired.c \
 	limits.c \
 	list.c \
+	list.h \
 	lockpw.c \
 	loginprompt.c \
 	mail.c \
@@ -190,6 +191,8 @@ libshadow_la_SOURCES = \
 	shadow/passwd/sgetpwent.h \
 	shadow/shadow/sgetspent.c \
 	shadow/shadow/sgetspent.h \
+	shadow/subid/sgetsient.c \
+	shadow/subid/sgetsient.h \
 	shadowio.c \
 	shadowio.h \
 	shadowlog.c \

lib/addgrps.c

@@ -76,6 +76,4 @@ add_groups(const char *list)
 	free(gids);
 	return -1;
 }
-#else				/* !USE_PAM */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !USE_PAM */

lib/age.c

@@ -125,7 +125,8 @@ int expire (const struct passwd *pw, /*@null@*/const struct spwd *sp)
 		exit (EXIT_FAILURE);
 	}
 
-	while (((child = wait (&status)) != pid) && (child != (pid_t)-1));
+	while (((child = wait (&status)) != pid) && (child != (pid_t)-1))
+		continue;
 
 	if ((child == pid) && (0 == status)) {
 		return 1;

lib/audit_help.c

@@ -129,8 +129,4 @@ void audit_logger_message (const char *message, shadow_audit_result result)
 		                        result);
 	}
 }
-
-#else				/* WITH_AUDIT */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* WITH_AUDIT */
-

lib/cleanup.c

@@ -75,7 +75,8 @@ void add_cleanup (/*@notnull@*/cleanup_function pcf, /*@null@*/void *arg)
 	}
 
 	/* Add the cleanup_function at the end of the stack */
-	for (i=0; NULL != cleanup_functions[i]; i++);
+	for (i=0; NULL != cleanup_functions[i]; i++)
+		continue;
 	cleanup_functions[i] = pcf;
 	cleanup_function_args[i] = arg;
 }

lib/find_new_sub_gids.c

@@ -58,7 +58,4 @@ int find_new_sub_gids (gid_t *range_start, unsigned long *range_count)
 	*range_count = count;
 	return 0;
 }
-#else				/* !ENABLE_SUBIDS */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !ENABLE_SUBIDS */
-

lib/find_new_sub_uids.c

@@ -58,7 +58,4 @@ int find_new_sub_uids (uid_t *range_start, unsigned long *range_count)
 	*range_count = count;
 	return 0;
 }
-#else				/* !ENABLE_SUBIDS */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !ENABLE_SUBIDS */
-

lib/groupio.c

@@ -332,7 +332,8 @@ static /*@null@*/struct commonio_entry *merge_group_entries (
 		return NULL;
 
 	/* Concatenate the 2 list of members */
-	for (i=0; NULL != gptr1->gr_mem[i]; i++);
+	for (i=0; NULL != gptr1->gr_mem[i]; i++)
+		continue;
 	members += i;
 	for (i=0; NULL != gptr2->gr_mem[i]; i++) {
 		char **pmember = gptr1->gr_mem;
@@ -402,7 +403,8 @@ static int split_groups (unsigned int max_members)
 		if (NULL == gptr) {
 			continue;
 		}
-		for (members = 0; NULL != gptr->gr_mem[members]; members++);
+		for (members = 0; NULL != gptr->gr_mem[members]; members++)
+			continue;
 		if (members <= max_members) {
 			continue;
 		}

lib/groupmem.c

@@ -46,7 +46,8 @@
 		return NULL;
 	}
 
-	for (i = 0; grent->gr_mem[i]; i++);
+	for (i = 0; grent->gr_mem[i]; i++)
+		continue;
 
 	/*@-mustfreeonly@*/
 	gr->gr_mem = MALLOC(i + 1, char *);

lib/limits.c

@@ -17,22 +17,21 @@
 
 #ifndef USE_PAM
 
-#ident "$Id$"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
 #include <ctype.h>
-#include "prototypes.h"
-#include "defines.h"
 #include <pwd.h>
-#include "getdef.h"
-#include "shadowlog.h"
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/resource.h>
 
 #include "atoi/a2i/a2i.h"
 #include "atoi/a2i/a2s.h"
 #include "atoi/str2i.h"
+#include "defines.h"
+#include "list.h"
+#include "getdef.h"
+#include "prototypes.h"
+#include "shadowlog.h"
 #include "string/memset/memzero.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
@@ -526,8 +525,4 @@ void setup_limits (const struct passwd *info)
 		}
 	}
 }
-
-#else				/* !USE_PAM */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !USE_PAM */
-

lib/list.c

@@ -8,16 +8,19 @@
 
 #include "config.h"
 
-#ident "$Id$"
+#include "list.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <sys/types.h>
 
 #include <assert.h>
 
 #include "alloc/malloc.h"
-#include "prototypes.h"
 #include "defines.h"
-#include "string/strchr/strchrcnt.h"
 #include "string/strcmp/streq.h"
 #include "string/strdup/strdup.h"
+#include "string/strtok/astrsep2ls.h"
 #include "string/strtok/strsep2ls.h"
 
 
@@ -142,7 +145,8 @@ dup_list(char *const *list)
 
 	assert (NULL != list);
 
-	for (i = 0; NULL != list[i]; i++);
+	for (i = 0; NULL != list[i]; i++)
+		continue;
 
 	tmp = XMALLOC(i + 1, char *);
 
@@ -197,26 +201,45 @@ comma_to_list(const char *comma)
 
 	members = xstrdup (comma);
 
-	/*
-	 * Allocate the array we're going to store the pointers into.
-	 * n: number of delimiters + last element + NULL
-	 */
+	array = acsv2ls(members);
+	if (array == NULL)
+		exit(EXIT_FAILURE);
 
-	n = strchrcnt(members, ',') + 2;
-	array = XMALLOC(n, char *);
+	if (array[0] == NULL)
+		free(members);
 
-	/*
-	 * Empty list is special - 0 members, not 1 empty member.  --marekm
-	 */
+	return array;
+}
 
-	if (streq(members, "")) {
-		*array = NULL;
-		free (members);
-		return array;
-	}
 
-	strsep2ls(members, ",", n, array);
+char **
+acsv2ls(char *s)
+{
+	char    **l;
+	size_t  n;
 
-	return array;
+	l = astrsep2ls(s, ",", &n);
+	if (l == NULL)
+		return NULL;
+
+	if (streq(l[n-1], ""))
+		l[n-1] = NULL;
+
+	return l;
 }
 
+
+int
+csv2ls(char *s, size_t n, char *ls[restrict n])
+{
+	ssize_t  i;
+
+	i = strsep2ls(s, ",", n, ls);
+	if (i == -1)
+		return -1;
+
+	if (streq(ls[i-1], ""))
+		ls[i-1] = NULL;
+
+	return 0;
+}

lib/list.h

@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: 2025, Alejandro Colomar <[email protected]>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_LIST_H_
+#define SHADOW_INCLUDE_LIB_LIST_H_
+
+
+#include "config.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+
+
+extern /*@only@*/char **add_list (/*@returned@*/ /*@only@*/char **, const char *);
+extern /*@only@*/char **del_list (/*@returned@*/ /*@only@*/char **, const char *);
+extern /*@only@*/char **dup_list (char *const *);
+extern bool is_on_list (char *const *list, const char *member);
+extern /*@only@*/char **comma_to_list (const char *);
+extern char **acsv2ls(char *s);
+extern int csv2ls(char *s, size_t n, char *ls[restrict n]);
+
+
+#endif  // include guard

lib/lockpw.c

@@ -80,6 +80,4 @@ int ulckpwdf (void)
 
 	return (pw_unlock (true) && spw_unlock (true))? 0 : -1;
 }
-#else
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif

lib/nscd.c

@@ -52,7 +52,4 @@ int nscd_flush_cache (const char *service)
 
 	return 0;
 }
-#else				/* USE_NSCD */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* USE_NSCD */
-

lib/pam_pass.c

@@ -57,6 +57,4 @@ void do_pam_passwd (const char *user, bool silent, bool change_expired)
 	fputs (_("passwd: password updated successfully\n"), shadow_logfd);
 	(void) pam_end (pamh, PAM_SUCCESS);
 }
-#else				/* !USE_PAM */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !USE_PAM */

lib/pam_pass_non_interactive.c

@@ -143,6 +143,4 @@ int do_pam_passwd_non_interactive (const char *pam_service,
 
 	return ((PAM_SUCCESS == ret) ? 0 : 1);
 }
-#else				/* !USE_PAM */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !USE_PAM */

lib/prototypes.h

@@ -197,13 +197,6 @@ void audit_logger_with_group(int type, const char *op, const char *name,
 extern void setup_limits (const struct passwd *);
 #endif
 
-/* list.c */
-extern /*@only@*/char **add_list (/*@returned@*/ /*@only@*/char **, const char *);
-extern /*@only@*/char **del_list (/*@returned@*/ /*@only@*/char **, const char *);
-extern /*@only@*/char **dup_list (char *const *);
-extern bool is_on_list (char *const *list, const char *member);
-extern /*@only@*/char **comma_to_list (const char *);
-
 #ifdef ENABLE_LASTLOG
 /* log.c */
 extern void dolastlog (

lib/pwauth.c

@@ -158,6 +158,4 @@ pw_auth(const char *cipher, const char *user)
 
 	return retval;
 }
-#else				/* !USE_PAM */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !USE_PAM */

lib/pwdcheck.c

@@ -35,6 +35,4 @@ void passwd_check (const char *user, const char *passwd, MAYBE_UNUSED const char
 		exit (EXIT_FAILURE);
 	}
 }
-#else			/* USE_PAM */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif			/* USE_PAM */

lib/selinux.c

@@ -203,7 +203,4 @@ int check_selinux_permit (const char *perm_name)
 	freecon (user_context_raw);
 	return r;
 }
-
-#else				/* !WITH_SELINUX */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !WITH_SELINUX */

lib/semanage.c

@@ -363,6 +363,4 @@ int del_seuser (const char *login_name)
 	semanage_handle_destroy (handle);
 	return ret;
 }
-#else				/* !WITH_SELINUX */
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif				/* !WITH_SELINUX */

lib/sgroupio.c

@@ -56,7 +56,8 @@
 		return NULL;
 	}
 
-	for (i = 0; NULL != sgent->sg_adm[i]; i++);
+	for (i = 0; NULL != sgent->sg_adm[i]; i++)
+		continue;
 	/*@-mustfreeonly@*/
 	sg->sg_adm = MALLOC(i + 1, char *);
 	/*@=mustfreeonly@*/
@@ -81,7 +82,8 @@
 	}
 	sg->sg_adm[i] = NULL;
 
-	for (i = 0; NULL != sgent->sg_mem[i]; i++);
+	for (i = 0; NULL != sgent->sg_mem[i]; i++)
+		continue;
 	/*@-mustfreeonly@*/
 	sg->sg_mem = MALLOC(i + 1, char *);
 	/*@=mustfreeonly@*/
@@ -310,6 +312,4 @@ int sgr_sort ()
 {
 	return commonio_sort_wrt (&gshadow_db, __gr_get_db ());
 }
-#else
-extern int ISO_C_forbids_an_empty_translation_unit;
 #endif