New upstream version 4.19.2

New upstream version 4.19.0
2026-01-25 14:17:08 +01:00 · 2026-01-06 00:37:15 +01:00
879 changed files with 20360 additions and 27753 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+ACLOCAL_AMFLAGS = -I m4

 SUBDIRS = lib

--- a/Makefile.in
+++ b/Makefile.in
@@ -165,9 +165,17 @@ am__define_uniq_tagged_files = \
  done | $(am__uniquify_input)`
 DIST_SUBDIRS = lib libsubid src po doc etc tests/unit man
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.rpath \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing \
 	$(top_srcdir)/man/po/Makefile.in ABOUT-NLS AUTHORS.md COPYING \
-	ChangeLog NEWS README compile config.guess config.rpath \
-	config.sub install-sh ltmain.sh missing
+	ChangeLog NEWS README build-aux/compile build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub \
+	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -215,6 +223,7 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_DISTCHECK_CONFIGURE_FLAGS = @AM_DISTCHECK_CONFIGURE_FLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -243,7 +252,6 @@ EGREP = @EGREP@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -287,7 +295,6 @@ LIBSYSTEMD = @LIBSYSTEMD@
 LIBTCB = @LIBTCB@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LIYESCRYPT = @LIYESCRYPT@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -388,6 +395,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = lib $(am__append_1) src po doc etc tests/unit \
 	$(am__append_2)
 CLEANFILES = man/8.out man/po/remove-potcdate.* man/*/login.defs.d man/*/*.mo
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -22,15 +22,14 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])

 # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
 #
-#   Copyright (C) 1999-2008, 2011-2019, 2021-2022 Free Software
-#   Foundation, Inc.
+#   Copyright (C) 1999-2008, 2011-2015 Free Software Foundation, Inc.
 #   Written by Thomas Tanner, 1999
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.

-# serial 21 LTDL_INIT
+# serial 20 LTDL_INIT

 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -358,7 +357,7 @@ AC_CONFIG_COMMANDS_PRE([
    if test -n "$_LT_LIBOBJS"; then
      # Remove the extension.
      _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
-      for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | $SED "$_lt_sed_drop_objext" | sort -u`; do
+      for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
        _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
        _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
      done
@@ -496,7 +495,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
    # If you are looking for one http://www.opendarwin.org/projects/dlcompat
    lt_cv_sys_dlopen_deplibs=yes
    ;;
-  freebsd* | dragonfly* | midnightbsd*)
+  freebsd* | dragonfly*)
    lt_cv_sys_dlopen_deplibs=yes
    ;;
  gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -931,8 +930,8 @@ AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])

-# pkg.m4 - Macros to locate and use pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 11 (pkg-config-0.29.1)

 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -974,7 +973,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -1019,7 +1018,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurrence in configure.ac, so if the first place
+dnl only at the first occurence in configure.ac, so if the first place
 dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
@@ -1075,7 +1074,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl

 pkg_failed=no
-AC_MSG_CHECKING([for $2])
+AC_MSG_CHECKING([for $1])

 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -1085,17 +1084,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])

 if test $pkg_failed = yes; then
-        AC_MSG_RESULT([no])
+   	AC_MSG_RESULT([no])
        _PKG_SHORT_ERRORS_SUPPORTED
        if test $_pkg_short_errors_supported = yes; then
-                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else
-                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
        fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

-        m4_default([$4], [AC_MSG_ERROR(
+	m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:

 $$1_PKG_ERRORS
@@ -1106,8 +1105,8 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
        ])
 elif test $pkg_failed = untried; then
-        AC_MSG_RESULT([no])
-        m4_default([$4], [AC_MSG_FAILURE(
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -1117,10 +1116,10 @@ _PKG_TEXT
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
        ])
 else
-        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
        AC_MSG_RESULT([yes])
-        $3
+	$3
 fi[]dnl
 ])dnl PKG_CHECK_MODULES

--- a/build-aux/compile
+++ b/build-aux/compile
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
--- a/build-aux/missing
+++ b/build-aux/missing
--- a/build-aux/test-driver
+++ b/build-aux/test-driver
--- a/config.h.in
+++ b/config.h.in
@@ -250,9 +250,6 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H

-/* Path for lastlog file. */
-#undef LASTLOG_FILE
-
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR

@@ -456,6 +453,3 @@

 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
-
-/* Path for wtmp file. */
-#undef _WTMP_FILE
--- a/696
+++ b/696
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,29 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.69])
-m4_define([libsubid_abi_major], 5)
-m4_define([libsubid_abi_minor], 0)
-m4_define([libsubid_abi_micro], 0)
+m4_define([libsubid_abi_major], [5])
+m4_define([libsubid_abi_minor], [0])
+m4_define([libsubid_abi_micro], [0])
 m4_define([libsubid_abi], [libsubid_abi_major.libsubid_abi_minor.libsubid_abi_micro])
-AC_INIT([shadow], [4.18.0], [pkg-shadow-devel@lists.alioth.debian.org], [],
+
+AC_INIT([shadow], [4.19.2], [pkg-shadow-devel@lists.alioth.debian.org], [],
 	[https://github.com/shadow-maint/shadow])
-AM_INIT_AUTOMAKE([1.11 foreign dist-xz subdir-objects tar-pax])
 AC_CONFIG_MACRO_DIRS([m4])
-AM_SILENT_RULES([yes])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])

+AM_INIT_AUTOMAKE([1.11 foreign dist-xz subdir-objects tar-pax])
+AM_SILENT_RULES([yes])
+
+AC_SUBST([AM_DISTCHECK_CONFIGURE_FLAGS], ["$ac_configure_args"])
+
 AC_SUBST([LIBSUBID_ABI_MAJOR], [libsubid_abi_major])
 AC_SUBST([LIBSUBID_ABI_MINOR], [libsubid_abi_minor])
 AC_SUBST([LIBSUBID_ABI_MICRO], [libsubid_abi_micro])
 AC_SUBST([LIBSUBID_ABI], [libsubid_abi])

 dnl Some hacks...
-test "$prefix" = "NONE" && prefix="/usr"
-test "$prefix" = "/usr" && exec_prefix=""
+test "x$prefix" = "xNONE" && prefix="/usr"
+test "X$prefix" = "X/usr" && exec_prefix=""

 AC_USE_SYSTEM_EXTENSIONS

@@ -36,15 +41,15 @@ LT_LIB_DLLOAD
 dnl Checks for libraries.

 dnl shadow now uses the libc's shadow implementation
-AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])])
+AC_CHECK_HEADER([shadow.h],[],[AC_MSG_ERROR([You need a libc with shadow.h])])

-AC_CHECK_FUNCS(arc4random_buf \
+AC_CHECK_FUNCS([arc4random_buf \
 	getentropy getrandom \
 	lckpwdf lutimes \
 	updwtmpx innetgr \
 	getspnam_r \
 	rpmatch \
-	memset_explicit explicit_bzero stpecpy stpeprintf)
+	memset_explicit explicit_bzero stpecpy stpeprintf])
 AC_SYS_LARGEFILE

 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -55,227 +60,230 @@ AC_CHECK_MEMBERS([struct utmpx.ut_name,
                  struct utmpx.ut_addr,
                  struct utmpx.ut_addr_v6,
                  struct utmpx.ut_time,
-                  struct utmpx.ut_xtime],,,[[#include <utmpx.h>]])
+                  struct utmpx.ut_xtime],[],[],[[#include <utmpx.h>]])

 dnl Checks for library functions.
 AC_FUNC_UTIME_NULL
-AC_REPLACE_FUNCS(putgrent putpwent putspent)
-AC_REPLACE_FUNCS(sgetgrent sgetpwent sgetspent)
+AC_REPLACE_FUNCS([putgrent putpwent putspent])
+AC_REPLACE_FUNCS([sgetgrent sgetpwent sgetspent])

-AC_CHECK_FUNC(setpgrp)
-AC_CHECK_FUNC(secure_getenv, [AC_DEFINE(HAS_SECURE_GETENV,
-                                        1,
-                                        [Defined to 1 if you have the declaration of 'secure_getenv'])])
+AC_CHECK_FUNC([setpgrp])
+AC_CHECK_FUNC([secure_getenv],
+	[AC_DEFINE([HAS_SECURE_GETENV],[1],[Defined to 1 if you have the declaration of 'secure_getenv'])]
+)

-AC_CACHE_CHECK([location of shared mail directory], shadow_cv_maildir,
+AC_CACHE_CHECK([location of shared mail directory], [shadow_cv_maildir],
 [for shadow_cv_maildir in /var/mail /var/spool/mail /usr/spool/mail /usr/mail none; do
 	if test -d $shadow_cv_maildir; then
 		break
 	fi
 done])
 if test $shadow_cv_maildir != none; then
-	AC_DEFINE_UNQUOTED(MAIL_SPOOL_DIR, "$shadow_cv_maildir",
+	AC_DEFINE_UNQUOTED([MAIL_SPOOL_DIR], ["$shadow_cv_maildir"],
 		[Location of system mail spool directory.])
 fi

-AC_CACHE_CHECK([location of user mail file], shadow_cv_mailfile,
+AC_CACHE_CHECK([location of user mail file], [shadow_cv_mailfile],
 [for shadow_cv_mailfile in Mailbox mailbox Mail mail .mail none; do
 	if test -f $HOME/$shadow_cv_mailfile; then
 		break
 	fi
 done])
 if test $shadow_cv_mailfile != none; then
-	AC_DEFINE_UNQUOTED(MAIL_SPOOL_FILE, "$shadow_cv_mailfile",
+	AC_DEFINE_UNQUOTED([MAIL_SPOOL_FILE], ["$shadow_cv_mailfile"],
 		[Name of user's mail spool file if stored in user's home directory.])
 fi

-AC_CACHE_CHECK([location of faillog/lastlog/wtmp], shadow_cv_logdir,
+AC_CACHE_CHECK([location of faillog/lastlog/wtmp], [shadow_cv_logdir],
 [for shadow_cv_logdir in /var/log /var/adm /usr/adm /etc; do
 	if test -d $shadow_cv_logdir; then
 		break
 	fi
 done])
-AC_DEFINE_UNQUOTED(_WTMP_FILE, "$shadow_cv_logdir/wtmp",
-	[Path for wtmp file.])
-AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog",
-	[Path for lastlog file.])
-AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$shadow_cv_logdir/faillog",
+AC_DEFINE_UNQUOTED([FAILLOG_FILE], ["$shadow_cv_logdir/faillog"],
 	[Path for faillog file.])

-AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$exec_prefix/bin/passwd",
+AC_DEFINE_UNQUOTED([PASSWD_PROGRAM], ["$exec_prefix/bin/passwd"],
 	[Path to passwd program.])

-AC_ARG_ENABLE(shadowgrp,
+AC_ARG_ENABLE([shadowgrp],
 	[AS_HELP_STRING([--enable-shadowgrp], [enable shadow group support @<:@default=yes@:>@])],
 	[case "${enableval}" in
 	 yes) enable_shadowgrp="yes" ;;
 	  no) enable_shadowgrp="no" ;;
-	   *) AC_MSG_ERROR(bad value ${enableval} for --enable-shadowgrp) ;;
+	   *) AC_MSG_ERROR([bad value ${enableval} for --enable-shadowgrp]) ;;
 	 esac],
 	[enable_shadowgrp="yes"]
 )

-AC_ARG_ENABLE(man,
+AC_ARG_ENABLE([man],
 	[AS_HELP_STRING([--enable-man],
 		[regenerate roff man pages from Docbook @<:@default=no@:>@])],
 	[enable_man="${enableval}"],
 	[enable_man="no"]
 )

-AC_ARG_ENABLE(account-tools-setuid,
+AC_ARG_ENABLE([account-tools-setuid],
 	[AS_HELP_STRING([--enable-account-tools-setuid],
 		[Install the user and group management tools setuid and authenticate the callers. This requires --with-libpam.])],
 	[case "${enableval}" in
 	 yes) enable_acct_tools_setuid="yes" ;;
 	  no) enable_acct_tools_setuid="no" ;;
-	   *) AC_MSG_ERROR(bad value ${enableval} for --enable-account-tools-setuid)
+	   *) AC_MSG_ERROR([bad value ${enableval} for --enable-account-tools-setuid])
 	   ;;
 	 esac],
 	[enable_acct_tools_setuid="no"]
 )

-AC_ARG_ENABLE(subordinate-ids,
+AC_ARG_ENABLE([subordinate-ids],
 	[AS_HELP_STRING([--enable-subordinate-ids],
 		[support subordinate ids @<:@default=yes@:>@])],
 	[enable_subids="${enableval}"],
 	[enable_subids="maybe"]
 )

-AC_ARG_ENABLE(lastlog,
+AC_ARG_ENABLE([lastlog],
 	[AS_HELP_STRING([--enable-lastlog],
 		[enable lastlog @<:@default=no@:>@])],
 	[enable_lastlog="${enableval}"],
 	[enable_lastlog="no"]
 )

-AC_ARG_ENABLE(logind,
-	[AS_HELP_STRING([--enable-logind],
-		[enable logind @<:@default=yes@:>@])],
-	[enable_logind="${enableval}"],
+AC_ARG_ENABLE([logind],
+	[AS_HELP_STRING([--disable-logind],
+		[disable logind integration])],
+	[
+		AS_CASE([${enableval}],
+			[yes],[],
+			[no],[],
+			[AC_MSG_ERROR([bad parameter value for --enable-logind=${enableval}.  ]dnl
+[Supported values are: --enable-logind (or --enable-logind=yes) and --disable-logind (or --enable-logind=no).])]
+		)
+	],
 	[enable_logind="yes"]
 )

-AC_ARG_WITH(audit,
+AC_ARG_WITH([audit],
 	[AS_HELP_STRING([--with-audit], [use auditing support @<:@default=yes if found@:>@])],
 	[with_audit=$withval], [with_audit=maybe])
-AC_ARG_WITH(libpam,
+AC_ARG_WITH([libpam],
 	[AS_HELP_STRING([--with-libpam], [use libpam for PAM support @<:@default=yes if found@:>@])],
 	[with_libpam=$withval], [with_libpam=maybe])
-AC_ARG_WITH(btrfs,
+AC_ARG_WITH([btrfs],
 	[AS_HELP_STRING([--with-btrfs], [add BtrFS support @<:@default=yes if found@:>@])],
 	[with_btrfs=$withval], [with_btrfs=maybe])
-AC_ARG_WITH(selinux,
+AC_ARG_WITH([selinux],
 	[AS_HELP_STRING([--with-selinux], [use SELinux support @<:@default=yes if found@:>@])],
 	[with_selinux=$withval], [with_selinux=maybe])
-AC_ARG_WITH(acl,
+AC_ARG_WITH([acl],
 	[AS_HELP_STRING([--with-acl], [use ACL support @<:@default=yes if found@:>@])],
 	[with_acl=$withval], [with_acl=maybe])
-AC_ARG_WITH(attr,
+AC_ARG_WITH([attr],
 	[AS_HELP_STRING([--with-attr], [use Extended Attribute support @<:@default=yes if found@:>@])],
 	[with_attr=$withval], [with_attr=maybe])
-AC_ARG_WITH(skey,
+AC_ARG_WITH([skey],
 	[AS_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])],
 	[with_skey=$withval], [with_skey=no])
-AC_ARG_WITH(tcb,
+AC_ARG_WITH([tcb],
 	[AS_HELP_STRING([--with-tcb], [use tcb support (incomplete) @<:@default=yes if found@:>@])],
 	[with_tcb=$withval], [with_tcb=maybe])
-AC_ARG_WITH(sha-crypt,
+AC_ARG_WITH([sha-crypt],
 	[AS_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])],
 	[with_sha_crypt=$withval], [with_sha_crypt=yes])
-AC_ARG_WITH(bcrypt,
+AC_ARG_WITH([bcrypt],
 	[AS_HELP_STRING([--with-bcrypt], [allow the bcrypt password encryption algorithm @<:@default=no@:>@])],
 	[with_bcrypt=$withval], [with_bcrypt=no])
-AC_ARG_WITH(yescrypt,
+AC_ARG_WITH([yescrypt],
 	[AS_HELP_STRING([--with-yescrypt], [allow the yescrypt password encryption algorithm @<:@default=no@:>@])],
 	[with_yescrypt=$withval], [with_yescrypt=no])
-AC_ARG_WITH(nscd,
+AC_ARG_WITH([nscd],
 	[AS_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])],
 	[with_nscd=$withval], [with_nscd=yes])
-AC_ARG_WITH(sssd,
+AC_ARG_WITH([sssd],
 	[AS_HELP_STRING([--with-sssd], [enable support for flushing sssd caches @<:@default=yes@:>@])],
 	[with_sssd=$withval], [with_sssd=yes])
-AC_ARG_WITH(group-name-max-length,
+AC_ARG_WITH([group-name-max-length],
 	[AS_HELP_STRING([--with-group-name-max-length], [set max group name length @<:@default=32@:>@])],
 	[with_group_name_max_length=$withval], [with_group_name_max_length=yes])
-AC_ARG_WITH(su,
+AC_ARG_WITH([su],
 	[AS_HELP_STRING([--with-su], [build and install su program and man page @<:@default=yes@:>@])],
 	[with_su=$withval], [with_su=yes])
-AC_ARG_WITH(libbsd,
+AC_ARG_WITH([libbsd],
 	[AS_HELP_STRING([--with-libbsd], [use libbsd support @<:@default=yes if found@:>@])],
 	[with_libbsd=$withval], [with_libbsd=yes])

-if test "$with_group_name_max_length" = "no" ; then
+if test "X$with_group_name_max_length" = "Xno" ; then
 	with_group_name_max_length=0
-elif test "$with_group_name_max_length" = "yes" ; then
+elif test "X$with_group_name_max_length" = "Xyes" ; then
 	with_group_name_max_length=32
 fi
-AC_DEFINE_UNQUOTED(GROUP_NAME_MAX_LENGTH, $with_group_name_max_length, [max group name length])
-AC_SUBST(GROUP_NAME_MAX_LENGTH)
+AC_DEFINE_UNQUOTED([GROUP_NAME_MAX_LENGTH], [$with_group_name_max_length], [max group name length])
+AC_SUBST([GROUP_NAME_MAX_LENGTH])
 GROUP_NAME_MAX_LENGTH="$with_group_name_max_length"


-AM_CONDITIONAL(USE_SHA_CRYPT, test "x$with_sha_crypt" = "xyes")
-if test "$with_sha_crypt" = "yes"; then
-	AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
+AM_CONDITIONAL([USE_SHA_CRYPT], [test "x$with_sha_crypt" = "xyes"])
+if test "X$with_sha_crypt" = "Xyes"; then
+	AC_DEFINE([USE_SHA_CRYPT], [1], [Define to allow the SHA256 and SHA512 password encryption algorithms])
 fi

-AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes")
-if test "$with_bcrypt" = "yes"; then
-	AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm])
+AM_CONDITIONAL([USE_BCRYPT], [test "x$with_bcrypt" = "xyes"])
+if test "X$with_bcrypt" = "Xyes"; then
+	AC_DEFINE([USE_BCRYPT], [1], [Define to allow the bcrypt password encryption algorithm])
 fi

-AM_CONDITIONAL(USE_YESCRYPT, test "x$with_yescrypt" = "xyes")
-if test "$with_yescrypt" = "yes"; then
-	AC_DEFINE(USE_YESCRYPT, 1, [Define to allow the yescrypt password encryption algorithm])
+AM_CONDITIONAL([USE_YESCRYPT], [test "x$with_yescrypt" = "xyes"])
+if test "X$with_yescrypt" = "Xyes"; then
+	AC_DEFINE([USE_YESCRYPT], [1], [Define to allow the yescrypt password encryption algorithm])
 fi

-if test "$with_nscd" = "yes"; then
-	AC_CHECK_FUNC(posix_spawn,
-	              [AC_DEFINE(USE_NSCD, 1, [Define to support flushing of nscd caches])],
+if test "X$with_nscd" = "Xyes"; then
+	AC_CHECK_FUNC([posix_spawn],
+	              [AC_DEFINE([USE_NSCD], [1], [Define to support flushing of nscd caches])],
 	              [AC_MSG_ERROR([posix_spawn is needed for nscd support])])
 fi

-if test "$with_sssd" = "yes"; then
-	AC_CHECK_FUNC(posix_spawn,
-	              [AC_DEFINE(USE_SSSD, 1, [Define to support flushing of sssd caches])],
+if test "X$with_sssd" = "Xyes"; then
+	AC_CHECK_FUNC([posix_spawn],
+	              [AC_DEFINE([USE_SSSD], [1], [Define to support flushing of sssd caches])],
 	              [AC_MSG_ERROR([posix_spawn is needed for sssd support])])
 fi

-AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su]))
+AS_IF([test "$with_su" != "no"], [AC_DEFINE([WITH_SU], [1], [Build with su])])
 AM_CONDITIONAL([WITH_SU], [test "x$with_su" != "xno"])

 dnl Check for some functions in libc first, only if not found check for
 dnl other libraries.  This should prevent linking libnsl if not really
 dnl needed (Linux glibc, Irix), but still link it if needed (Solaris).

-AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_SEARCH_LIBS([gethostbyname], [nsl])

 PKG_CHECK_MODULES([CMOCKA], [cmocka], [have_cmocka="yes"],
 	[AC_MSG_WARN([libcmocka not found, cmocka tests will not be built])])
 AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka = xyes])

+AC_ARG_ENABLE([vendordir],
+    [AS_HELP_STRING([--enable-vendordir=DIR], [Directory for distribution provided configuration files])],[],[])
 AC_CHECK_LIB([econf],[econf_readDirs],[LIBECONF="-leconf"],[LIBECONF=""])
 if test -n "$LIBECONF"; then
        AC_DEFINE_UNQUOTED([VENDORDIR], ["$enable_vendordir"],
 					[Directory for distribution provided configuration files])
 	ECONF_CPPFLAGS="-DUSE_ECONF=1"
-	AC_ARG_ENABLE([vendordir],
-		AS_HELP_STRING([--enable-vendordir=DIR], [Directory for distribution provided configuration files]),,[])
 fi
-AC_SUBST(ECONF_CPPFLAGS)
-AC_SUBST(LIBECONF)
+AC_SUBST([ECONF_CPPFLAGS])
+AC_SUBST([LIBECONF])
 AC_SUBST([VENDORDIR], [$enable_vendordir])
 if test "x$enable_vendordir" != x; then
-	AC_DEFINE(HAVE_VENDORDIR, 1, [Define to support vendor settings.])
+	AC_DEFINE([HAVE_VENDORDIR], [1], [Define to support vendor settings.])
 fi
 AM_CONDITIONAL([HAVE_VENDORDIR], [test "x$enable_vendordir" != x])

-if test "$enable_shadowgrp" = "yes"; then
-	AC_DEFINE(SHADOWGRP, 1, [Define to support the shadow group file.])
+if test "X$enable_shadowgrp" = "Xyes"; then
+	AC_DEFINE([SHADOWGRP], [1], [Define to support the shadow group file.])
 fi
-AM_CONDITIONAL(SHADOWGRP, test "x$enable_shadowgrp" = "xyes")
+AM_CONDITIONAL([SHADOWGRP], [test "x$enable_shadowgrp" = "xyes"])

-if test "$enable_man" = "yes"; then
+if test "X$enable_man" = "Xyes"; then
 	dnl
 	dnl Check for xsltproc
 	dnl
@@ -287,21 +295,21 @@ if test "$enable_man" = "yes"; then

 	dnl check for DocBook DTD and stylesheets in the local catalog.
 	JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.5//EN],
-		[DocBook XML DTD V4.5], [], enable_man=no)
+		[DocBook XML DTD V4.5], [], [enable_man=no])
 	JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-		[DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no)
+		[DocBook XSL Stylesheets >= 1.70.1], [], [enable_man=no])
 fi
-AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno")
+AM_CONDITIONAL([ENABLE_REGENERATE_MAN], [test "x$enable_man" != "xno"])

 if test "$enable_subids" != "no"; then
 	dnl
 	dnl FIXME: check if 32 bit UIDs/GIDs are supported by libc
 	dnl
-	AC_CHECK_SIZEOF([uid_t],, [#include "sys/types.h"])
-	AC_CHECK_SIZEOF([gid_t],, [#include "sys/types.h"])
+	AC_CHECK_SIZEOF([uid_t],[], [[#include "sys/types.h"]])
+	AC_CHECK_SIZEOF([gid_t],[], [[#include "sys/types.h"]])

 	if test "$ac_cv_sizeof_uid_t" -ge 4 && test "$ac_cv_sizeof_gid_t" -ge 4; then
-		AC_DEFINE(ENABLE_SUBIDS, 1, [Define to support the subordinate IDs.])
+		AC_DEFINE([ENABLE_SUBIDS], [1], [Define to support the subordinate IDs.])
 		enable_subids="yes"
 	else
 		if test "x$enable_subids" = "xyes"; then
@@ -310,55 +318,54 @@ if test "$enable_subids" != "no"; then
 		enable_subids="no"
 	fi
 fi
-AM_CONDITIONAL(ENABLE_SUBIDS, test "x$enable_subids" != "xno")
+AM_CONDITIONAL([ENABLE_SUBIDS], [test "x$enable_subids" != "xno"])

-if test "$enable_lastlog" = "yes" && test "$ac_cv_header_lastlog_h" = "yes"; then
-	AC_CACHE_CHECK(for ll_host in struct lastlog,
-		ac_cv_struct_lastlog_ll_host,
-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <lastlog.h>],
-					[struct lastlog ll; char *cp = ll.ll_host;]
-				)],
+if test "X$enable_lastlog" = "Xyes" && test "X$ac_cv_header_lastlog_h" = "Xyes"; then
+	AC_CACHE_CHECK([for ll_host in struct lastlog],
+		[ac_cv_struct_lastlog_ll_host],
+		[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <lastlog.h>]],
+					[struct lastlog ll; char *cp = ll.ll_host;])],
 			[ac_cv_struct_lastlog_ll_host=yes],
-			[ac_cv_struct_lastlog_ll_host=no]
-		)
+			[ac_cv_struct_lastlog_ll_host=no])
+		]
 	)

-	if test "$ac_cv_struct_lastlog_ll_host" = "yes"; then
-		AC_DEFINE(HAVE_LL_HOST, 1,
+	if test "X$ac_cv_struct_lastlog_ll_host" = "Xyes"; then
+		AC_DEFINE([HAVE_LL_HOST], [1],
 			[Define if struct lastlog has ll_host])
-		AC_DEFINE(ENABLE_LASTLOG, 1, [Define to support lastlog.])
+		AC_DEFINE([ENABLE_LASTLOG], [1], [Define to support lastlog.])
 		enable_lastlog="yes"
 	else
 		AC_MSG_ERROR([Cannot enable support for lastlog on systems where the data structures aren't available])
 		enable_lastlog="no"
 	fi
 fi
-AM_CONDITIONAL(ENABLE_LASTLOG, test "x$enable_lastlog" != "xno")
+AM_CONDITIONAL([ENABLE_LASTLOG], [test "x$enable_lastlog" != "xno"])

-AC_SUBST(LIBSYSTEMD)
-if test "$enable_logind" = "yes"; then
-	AC_CHECK_LIB(systemd, sd_session_get_remote_host,
-		[enable_logind="yes"; [LIBSYSTEMD=-lsystemd];
-		AC_DEFINE(ENABLE_LOGIND, 1,
-			[Define to manage session support with logind.])],
-		[enable_logind="no"])
+AC_SUBST([LIBSYSTEMD])
+if test "X$enable_logind" = "Xyes"; then
+	AC_CHECK_LIB([systemd], [sd_session_get_remote_host],
+		[
+			LIBSYSTEMD=-lsystemd
+			AC_DEFINE([ENABLE_LOGIND], [1], [Define to manage session support with logind.])
+		],[
+			AC_MSG_ERROR([libsystemd not found.  If logind integration is not required, disable it using the --disable-logind option. ]dnl
+[ If logind integration is required, consider installing systemd or another package that provides libsystemd.])
+		]
+	)
 fi
-AM_CONDITIONAL(ENABLE_LOGIND, test "x$enable_logind" != "xno")
+AM_CONDITIONAL([ENABLE_LOGIND], [test "X$enable_logind" = "Xyes"])

-AC_SUBST(LIBCRYPT)
-AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
+AC_CHECK_LIB([crypt], [crypt], [LIBCRYPT=-lcrypt],
 	[AC_MSG_ERROR([crypt() not found])])
+AC_SUBST([LIBCRYPT])

-AC_SUBST(LIYESCRYPT)
-AC_CHECK_LIB(crypt, crypt, [LIYESCRYPT=-lcrypt],
-	[AC_MSG_ERROR([crypt() not found])])
-
-AC_SUBST(LIBBSD)
+AC_SUBST([LIBBSD])
 if test "$with_libbsd" != "no"; then
 	AC_SEARCH_LIBS([readpassphrase], [bsd], [], [
 		AC_MSG_ERROR([readpassphrase() is missing, either from libc or libbsd])
 	])
-	AS_IF([test "$ac_cv_search_readpassphrase" = "-lbsd"], [
+	AS_IF([test "X$ac_cv_search_readpassphrase" = "X-lbsd"], [
 		PKG_CHECK_MODULES([LIBBSD], [libbsd-overlay])
 	])
 	dnl Make sure either the libc or libbsd provide the header.
@@ -369,29 +376,29 @@ if test "$with_libbsd" != "no"; then
 		AC_MSG_ERROR([readpassphrase.h is missing])
 	])
 	CFLAGS="$save_CFLAGS"
-	AC_DEFINE(WITH_LIBBSD, 1, [Build shadow with libbsd support])
+	AC_DEFINE([WITH_LIBBSD], [1], [Build shadow with libbsd support])
 else
-	AC_DEFINE(WITH_LIBBSD, 0, [Build shadow without libbsd support])
+	AC_DEFINE([WITH_LIBBSD], [0], [Build shadow without libbsd support])
 fi
-AM_CONDITIONAL(WITH_LIBBSD, test x$with_libbsd = xyes)
+AM_CONDITIONAL([WITH_LIBBSD], [test x$with_libbsd = xyes])

-AC_SUBST(LIBACL)
+AC_SUBST([LIBACL])
 if test "$with_acl" != "no"; then
-	AC_CHECK_HEADERS(acl/libacl.h attr/error_context.h, [acl_header="yes"], [acl_header="no"])
-	if test "$acl_header$with_acl" = "noyes" ; then
+	AC_CHECK_HEADERS([acl/libacl.h attr/error_context.h], [acl_header="yes"], [acl_header="no"])
+	if test "X$acl_header$with_acl" = "Xnoyes" ; then
 		AC_MSG_ERROR([acl/libacl.h or attr/error_context.h is missing])
-	elif test "$acl_header" = "yes" ; then
-		AC_CHECK_LIB(acl, perm_copy_file,
-		             [AC_CHECK_LIB(acl, perm_copy_fd,
+	elif test "X$acl_header" = "Xyes" ; then
+		AC_CHECK_LIB([acl], [perm_copy_file],
+		             [AC_CHECK_LIB([acl], [perm_copy_fd],
 		                           [acl_lib="yes"],
 		                           [acl_lib="no"])],
 		             [acl_lib="no"])
-		if test "$acl_lib$with_acl" = "noyes" ; then
+		if test "X$acl_lib$with_acl" = "Xnoyes" ; then
 			AC_MSG_ERROR([libacl not found])
-		elif test "$acl_lib" = "no" ; then
+		elif test "X$acl_lib" = "Xno" ; then
 			with_acl="no"
 		else
-			AC_DEFINE(WITH_ACL, 1,
+			AC_DEFINE([WITH_ACL], [1],
 			          [Build shadow with ACL support])
 			LIBACL="-lacl"
 			with_acl="yes"
@@ -401,23 +408,23 @@ if test "$with_acl" != "no"; then
 	fi
 fi

-AC_SUBST(LIBATTR)
+AC_SUBST([LIBATTR])
 if test "$with_attr" != "no"; then
-	AC_CHECK_HEADERS(attr/libattr.h attr/error_context.h, [attr_header="yes"], [attr_header="no"])
-	if test "$attr_header$with_attr" = "noyes" ; then
+	AC_CHECK_HEADERS([attr/libattr.h attr/error_context.h], [attr_header="yes"], [attr_header="no"])
+	if test "X$attr_header$with_attr" = "noyes" ; then
 		AC_MSG_ERROR([attr/libattr.h or attr/error_context.h is missing])
-	elif test "$attr_header" = "yes" ; then
-		AC_CHECK_LIB(attr, attr_copy_file,
-		             [AC_CHECK_LIB(attr, attr_copy_fd,
+	elif test "X$attr_header" = "Xyes" ; then
+		AC_CHECK_LIB([attr], [attr_copy_file],
+		             [AC_CHECK_LIB([attr], [attr_copy_fd],
 		                           [attr_lib="yes"],
 		                           [attr_lib="no"])],
 		             [attr_lib="no"])
-		if test "$attr_lib$with_attr" = "noyes" ; then
+		if test "X$attr_lib$with_attr" = "Xnoyes" ; then
 			AC_MSG_ERROR([libattr not found])
-		elif test "$attr_lib" = "no" ; then
+		elif test "X$attr_lib" = "Xno" ; then
 			with_attr="no"
 		else
-			AC_DEFINE(WITH_ATTR, 1,
+			AC_DEFINE([WITH_ATTR], [1],
 			          [Build shadow with Extended Attributes support])
 			LIBATTR="-lattr"
 			with_attr="yes"
@@ -427,29 +434,29 @@ if test "$with_attr" != "no"; then
 	fi
 fi

-AC_SUBST(LIBAUDIT)
+AC_SUBST([LIBAUDIT])
 if test "$with_audit" != "no"; then
-	AC_CHECK_HEADER(libaudit.h, [audit_header="yes"], [audit_header="no"])
-	if test "$audit_header$with_audit" = "noyes" ; then
+	AC_CHECK_HEADER([libaudit.h], [audit_header="yes"], [audit_header="no"])
+	if test "X$audit_header$with_audit" = "Xnoyes" ; then
 		AC_MSG_ERROR([libaudit.h is missing])
-	elif test "$audit_header" = "yes"; then
-		AC_CHECK_DECL(AUDIT_ADD_USER,,[audit_header="no"],[#include <libaudit.h>])
-		AC_CHECK_DECL(AUDIT_DEL_USER,,[audit_header="no"],[#include <libaudit.h>])
-		AC_CHECK_DECL(AUDIT_ADD_GROUP,,[audit_header="no"],[#include <libaudit.h>])
-		AC_CHECK_DECL(AUDIT_DEL_GROUP,,[audit_header="no"],[#include <libaudit.h>])
-		if test "$audit_header$with_audit" = "noyes" ; then
+	elif test "X$audit_header" = "Xyes"; then
+		AC_CHECK_DECL([AUDIT_ADD_USER],[],[audit_header="no"],[[#include <libaudit.h>]])
+		AC_CHECK_DECL([AUDIT_DEL_USER],[],[audit_header="no"],[[#include <libaudit.h>]])
+		AC_CHECK_DECL([AUDIT_ADD_GROUP],[],[audit_header="no"],[[#include <libaudit.h>]])
+		AC_CHECK_DECL([AUDIT_DEL_GROUP],[],[audit_header="no"],[[#include <libaudit.h>]])
+		if test "X$audit_header$with_audit" = "Xnoyes" ; then
 			AC_MSG_ERROR([AUDIT_ADD_USER AUDIT_DEL_USER AUDIT_ADD_GROUP or AUDIT_DEL_GROUP missing from libaudit.h])
 		fi
 	fi
-	if test "$audit_header" = "yes"; then
-		AC_CHECK_LIB(audit, audit_log_acct_message,
+	if test "X$audit_header" = "Xyes"; then
+		AC_CHECK_LIB([audit], [audit_log_acct_message],
 		             [audit_lib="yes"], [audit_lib="no"])
-		if test "$audit_lib$with_audit" = "noyes" ; then
+		if test "X$audit_lib$with_audit" = "Xnoyes" ; then
 			AC_MSG_ERROR([libaudit not found])
-		elif test "$audit_lib" = "no" ; then
+		elif test "X$audit_lib" = "Xno" ; then
 			with_audit="no"
 		else
-			AC_DEFINE(WITH_AUDIT, 1,
+			AC_DEFINE([WITH_AUDIT], [1],
 			          [Define if you want to enable Audit messages])
 			LIBAUDIT="-laudit"
 			with_audit="yes"
@@ -462,43 +469,43 @@ fi
 if test "$with_btrfs" != "no"; then
 	AC_CHECK_HEADERS([sys/statfs.h linux/magic.h linux/btrfs_tree.h], \
 		[btrfs_headers="yes"], [btrfs_headers="no"])
-	if test "$btrfs_headers$with_btrfs" = "noyes" ; then
+	if test "X$btrfs_headers$with_btrfs" = "Xnoyes" ; then
 		AC_MSG_ERROR([One of sys/statfs.h linux/magic.h linux/btrfs_tree.h is missing])
 	fi

-	if test "$btrfs_headers" = "yes" ; then
-		AC_DEFINE(WITH_BTRFS, 1, [Build shadow with BtrFS support])
+	if test "X$btrfs_headers" = "Xyes" ; then
+		AC_DEFINE([WITH_BTRFS], [1], [Build shadow with BtrFS support])
 		with_btrfs="yes"
 	fi
 fi
-AM_CONDITIONAL(WITH_BTRFS, test x$with_btrfs = xyes)
+AM_CONDITIONAL([WITH_BTRFS], [test x$with_btrfs = xyes])

-AC_SUBST(LIBSELINUX)
-AC_SUBST(LIBSEMANAGE)
+AC_SUBST([LIBSELINUX])
+AC_SUBST([LIBSEMANAGE])
 if test "$with_selinux" != "no"; then
-	AC_CHECK_HEADERS(selinux/selinux.h, [selinux_header="yes"], [selinux_header="no"])
-	if test "$selinux_header$with_selinux" = "noyes" ; then
+	AC_CHECK_HEADERS([selinux/selinux.h], [selinux_header="yes"], [selinux_header="no"])
+	if test "X$selinux_header$with_selinux" = "Xnoyes" ; then
 		AC_MSG_ERROR([selinux/selinux.h is missing])
 	fi

-	AC_CHECK_HEADERS(semanage/semanage.h, [semanage_header="yes"], [semanage_header="no"])
-	if test "$semanage_header$with_selinux" = "noyes" ; then
+	AC_CHECK_HEADERS([semanage/semanage.h], [semanage_header="yes"], [semanage_header="no"])
+	if test "X$semanage_header$with_selinux" = "Xnoyes" ; then
 		AC_MSG_ERROR([semanage/semanage.h is missing])
 	fi

-	if test "$selinux_header$semanage_header" = "yesyes" ; then
-		AC_CHECK_LIB(selinux, is_selinux_enabled, [selinux_lib="yes"], [selinux_lib="no"])
-		if test "$selinux_lib$with_selinux" = "noyes" ; then
+	if test "X$selinux_header$semanage_header" = "Xyesyes" ; then
+		AC_CHECK_LIB([selinux], [is_selinux_enabled], [selinux_lib="yes"], [selinux_lib="no"])
+		if test "X$selinux_lib$with_selinux" = "Xnoyes" ; then
 			AC_MSG_ERROR([libselinux not found])
 		fi

-		AC_CHECK_LIB(semanage, semanage_connect, [semanage_lib="yes"], [semanage_lib="no"])
-		if test "$semanage_lib$with_selinux" = "noyes" ; then
+		AC_CHECK_LIB([semanage], [semanage_connect], [semanage_lib="yes"], [semanage_lib="no"])
+		if test "X$semanage_lib$with_selinux" = "Xnoyes" ; then
 			AC_MSG_ERROR([libsemanage not found])
 		fi

-		if test "$selinux_lib$semanage_lib" = "yesyes" ; then
-			AC_DEFINE(WITH_SELINUX, 1,
+		if test "X$selinux_lib$semanage_lib" = "Xyesyes" ; then
+			AC_DEFINE([WITH_SELINUX], [1],
 			          [Build shadow with SELinux support])
 			LIBSELINUX="-lselinux"
 			LIBSEMANAGE="-lsemanage"
@@ -511,19 +518,19 @@ if test "$with_selinux" != "no"; then
 	fi
 fi

-AC_SUBST(LIBTCB)
+AC_SUBST([LIBTCB])
 if test "$with_tcb" != "no"; then
-	AC_CHECK_HEADERS(tcb.h, [tcb_header="yes"], [tcb_header="no"])
-	if test "$tcb_header$with_tcb" = "noyes" ; then
+	AC_CHECK_HEADERS([tcb.h], [tcb_header="yes"], [tcb_header="no"])
+	if test "X$tcb_header$with_tcb" = "Xnoyes" ; then
 		AC_MSG_ERROR([tcb.h is missing])
-	elif test "$tcb_header" = "yes" ; then
-		AC_CHECK_LIB(tcb, tcb_is_suspect, [tcb_lib="yes"], [tcb_lib="no"])
-		if test "$tcb_lib$with_tcb" = "noyes" ; then
+	elif test "X$tcb_header" = "Xyes" ; then
+		AC_CHECK_LIB([tcb], [tcb_is_suspect], [tcb_lib="yes"], [tcb_lib="no"])
+		if test "X$tcb_lib$with_tcb" = "Xnoyes" ; then
 			AC_MSG_ERROR([libtcb not found])
-		elif test "$tcb_lib" = "no" ; then
+		elif test "X$tcb_lib" = "Xno" ; then
 			with_tcb="no"
 		else
-			AC_DEFINE(WITH_TCB, 1, [Build shadow with tcb support (incomplete)])
+			AC_DEFINE([WITH_TCB], [1], [Build shadow with tcb support (incomplete)])
 			LIBTCB="-ltcb"
 			with_tcb="yes"
 		fi
@@ -531,39 +538,39 @@ if test "$with_tcb" != "no"; then
 		with_tcb="no"
 	fi
 fi
-AM_CONDITIONAL(WITH_TCB, test x$with_tcb = xyes)
+AM_CONDITIONAL([WITH_TCB], [test x$with_tcb = xyes])

-AC_SUBST(LIBPAM)
+AC_SUBST([LIBPAM])
 if test "$with_libpam" != "no"; then
-	AC_CHECK_LIB(pam, pam_start,
+	AC_CHECK_LIB([pam], [pam_start],
 	             [pam_lib="yes"], [pam_lib="no"])
-	if test "$pam_lib$with_libpam" = "noyes" ; then
-		AC_MSG_ERROR(libpam not found)
+	if test "X$pam_lib$with_libpam" = "Xnoyes" ; then
+		AC_MSG_ERROR([libpam not found])
 	fi

 	LIBPAM="-lpam"
 	pam_conv_function="no"

-	AC_CHECK_LIB(pam, openpam_ttyconv,
+	AC_CHECK_LIB([pam], [openpam_ttyconv],
 	             [pam_conv_function="openpam_ttyconv"],
-	             AC_CHECK_LIB(pam_misc, misc_conv,
-	                          [pam_conv_function="misc_conv"; LIBPAM="$LIBPAM -lpam_misc"])
+	             [AC_CHECK_LIB([pam_misc], [misc_conv],
+	                           [pam_conv_function="misc_conv"; LIBPAM="$LIBPAM -lpam_misc"])]
 	            )

-	if test "$pam_conv_function$with_libpam" = "noyes" ; then
-		AC_MSG_ERROR(PAM conversation function not found)
+	if test "X$pam_conv_function$with_libpam" = "Xnoyes" ; then
+		AC_MSG_ERROR([PAM conversation function not found])
 	fi

 	pam_headers_found=no
 	AC_CHECK_HEADERS( [security/openpam.h security/pam_misc.h],
 	                 [ pam_headers_found=yes ; break ], [],
-	                 [ #include <security/pam_appl.h> ] )
-	if test "$pam_headers_found$with_libpam" = "noyes" ; then
-	                AC_MSG_ERROR(PAM headers not found)
+	                 [[#include <security/pam_appl.h>]] )
+	if test "X$pam_headers_found$with_libpam" = "Xnoyes" ; then
+	                AC_MSG_ERROR([PAM headers not found])
 	fi


-	if test "$pam_lib$pam_headers_found" = "yesyes" -a "$pam_conv_function" != "no" ; then
+	if test "X$pam_lib$pam_headers_found" = "Xyesyes" && test "$pam_conv_function" != "no" ; then
 		with_libpam="yes"
 	else
 		with_libpam="no"
@@ -571,87 +578,86 @@ if test "$with_libpam" != "no"; then
 	fi
 fi
 dnl Now with_libpam is either yes or no
-if test "$with_libpam" = "yes"; then
+if test "X$with_libpam" = "Xyes"; then
 	AC_CHECK_DECLS([PAM_ESTABLISH_CRED,
 	                PAM_DELETE_CRED,
 	                PAM_NEW_AUTHTOK_REQD,
 	                PAM_DATA_SILENT],
-	               [], [], [#include <security/pam_appl.h>])
+	               [], [], [[#include <security/pam_appl.h>]])


 	save_libs=$LIBS
 	LIBS="$LIBS $LIBPAM"
 	# We do not use AC_CHECK_FUNCS to avoid duplicated definition with
 	# Linux PAM.
-	AC_CHECK_FUNC(pam_fail_delay, [AC_DEFINE(HAS_PAM_FAIL_DELAY, 1, [Define to 1 if you have the declaration of 'pam_fail_delay'])])
+	AC_CHECK_FUNC([pam_fail_delay], [AC_DEFINE([HAS_PAM_FAIL_DELAY], [1], [Define to 1 if you have the declaration of 'pam_fail_delay'])])
 	LIBS=$save_libs

-	AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])
-	AC_DEFINE_UNQUOTED(SHADOW_PAM_CONVERSATION, [$pam_conv_function],[PAM conversation to use])
-	AM_CONDITIONAL(USE_PAM, [true])
+	AC_DEFINE([USE_PAM], [1], [Define to support Pluggable Authentication Modules])
+	AC_DEFINE_UNQUOTED([SHADOW_PAM_CONVERSATION], [$pam_conv_function],[PAM conversation to use])

-	AC_MSG_CHECKING(use login and su access checking if PAM not used)
-	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING([use login and su access checking if PAM not used])
+	AC_MSG_RESULT([no])
 else
-	AC_DEFINE(SU_ACCESS, 1, [Define to support /etc/suauth su access control.])
-	AM_CONDITIONAL(USE_PAM, [false])
-	AC_MSG_CHECKING(use login and su access checking if PAM not used)
-	AC_MSG_RESULT(yes)
+	AC_DEFINE([SU_ACCESS], [1], [Define to support /etc/suauth su access control.])
+	AC_MSG_CHECKING([use login and su access checking if PAM not used])
+	AC_MSG_RESULT([yes])
 fi
+AM_CONDITIONAL([USE_PAM], [test "X$with_libpam" = "Xyes"])

 if test "$enable_acct_tools_setuid" != "no"; then
 	if test "$with_libpam" != "yes"; then
-		if test "$enable_acct_tools_setuid" = "yes"; then
-			AC_MSG_ERROR(PAM support is required for --enable-account-tools-setuid)
+		if test "X$enable_acct_tools_setuid" = "Xyes"; then
+			AC_MSG_ERROR([PAM support is required for --enable-account-tools-setuid])
 		else
 			enable_acct_tools_setuid="no"
 		fi
 	else
 		enable_acct_tools_setuid="yes"
 	fi
-	if test "$enable_acct_tools_setuid" = "yes"; then
-		AC_DEFINE(ACCT_TOOLS_SETUID,
-		          1,
+	if test "X$enable_acct_tools_setuid" = "Xyes"; then
+		AC_DEFINE([ACCT_TOOLS_SETUID],
+		          [1],
 		          [Define if account management tools should be installed setuid and authenticate the callers])
 	fi
 fi
-AM_CONDITIONAL(ACCT_TOOLS_SETUID, test "x$enable_acct_tools_setuid" = "xyes")
+AM_CONDITIONAL([ACCT_TOOLS_SETUID], [test "x$enable_acct_tools_setuid" = "xyes"])


-AC_ARG_WITH(fcaps,
+AC_ARG_WITH([fcaps],
 	[AS_HELP_STRING([--with-fcaps], [use file capabilities instead of suid binaries for newuidmap/newgidmap @<:@default=no@:>@])],
 	[with_fcaps=$withval], [with_fcaps=no])
-AM_CONDITIONAL(FCAPS, test "x$with_fcaps" = "xyes")
+AM_CONDITIONAL([FCAPS], [test "x$with_fcaps" = "xyes"])

 if test "x$with_fcaps" = "xyes"; then
-	AC_CHECK_PROGS(capcmd, "setcap")
+	AC_CHECK_PROGS([capcmd], ["setcap"])
 	if test "x$capcmd" = "x" ; then
 		AC_MSG_ERROR([setcap command not available])
 	fi
 fi

-AC_SUBST(LIBSKEY)
-AC_SUBST(LIBMD)
-if test "$with_skey" = "yes"; then
-	AC_CHECK_LIB(md, MD5Init, [LIBMD=-lmd])
-	AC_CHECK_LIB(skey, skeychallenge, [LIBSKEY=-lskey],
+AC_SUBST([LIBSKEY])
+AC_SUBST([LIBMD])
+if test "X$with_skey" = "Xyes"; then
+	AC_CHECK_LIB([md], [MD5Init], [LIBMD=-lmd])
+	AC_CHECK_LIB([skey], [skeychallenge], [LIBSKEY=-lskey],
 		[AC_MSG_ERROR([libskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])])
-	AC_DEFINE(SKEY, 1, [Define to support S/Key logins.])
+	AC_DEFINE([SKEY], [1], [Define to support S/Key logins.])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		#include <stdio.h>
 		#include <skey.h>
 	]], [[
 		skeychallenge((void*)0, (void*)0, (void*)0, 0);
-	]])],[AC_DEFINE(SKEY_BSD_STYLE, 1, [Define to support newer BSD S/Key API])],[])
+	]])],[AC_DEFINE([SKEY_BSD_STYLE], [1], [Define to support newer BSD S/Key API])],[])
 fi

-AC_CHECK_FUNC(fgetpwent_r, [AC_DEFINE(HAVE_FGETPWENT_R, 1, [Defined to 1 if you have the declaration of 'fgetpwent_r'])])
+AC_CHECK_FUNC([fgetpwent_r], [AC_DEFINE([HAVE_FGETPWENT_R], [1], [Defined to 1 if you have the declaration of 'fgetpwent_r'])])

-AC_DEFINE_UNQUOTED(SHELL, ["$SHELL"], [The default shell.])
+AC_DEFINE_UNQUOTED([SHELL], ["$SHELL"], [The default shell.])

 AM_GNU_GETTEXT_VERSION([0.19])
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" = "xyes")
+AM_CONDITIONAL([USE_NLS], [test "x$USE_NLS" = "xyes"])

 AC_CONFIG_FILES([
 	Makefile
@@ -690,30 +696,28 @@ AC_CONFIG_FILES([
 ])
 AC_OUTPUT

-echo
-echo "shadow will be compiled with the following features:"
-echo
-echo "	auditing support:		$with_audit"
-echo "	PAM support:			$with_libpam"
-if test "$with_libpam" = "yes"; then
-echo "	suid account management tools:	$enable_acct_tools_setuid"
-fi
-echo "	SELinux support:		$with_selinux"
-echo "	BtrFS support:			$with_btrfs"
-echo "	ACL support:			$with_acl"
-echo "	Extended Attributes support:	$with_attr"
-echo "	tcb support (incomplete):	$with_tcb"
-echo "	shadow group support:		$enable_shadowgrp"
-echo "	S/Key support:			$with_skey"
-echo "	SHA passwords encryption:	$with_sha_crypt"
-echo "	bcrypt passwords encryption:	$with_bcrypt"
-echo "	yescrypt passwords encryption:	$with_yescrypt"
-echo "	nscd support:			$with_nscd"
-echo "	sssd support:			$with_sssd"
-echo "	subordinate IDs support:	$enable_subids"
-echo "	enable lastlog:			$enable_lastlog"
-echo "	enable logind:			$enable_logind"
-echo "	use file caps:			$with_fcaps"
-echo "	install su:			$with_su"
-echo "	enabled vendor dir:             $enable_vendordir"
-echo
+AC_MSG_NOTICE([shadow ${PACKAGE_VERSION} has been configured with the following features:
+
+	auditing support:		$with_audit
+	PAM support:			$with_libpam
+	suid account management tools:	$enable_acct_tools_setuid
+	SELinux support:		$with_selinux
+	BtrFS support:			$with_btrfs
+	ACL support:			$with_acl
+	Extended Attributes support:	$with_attr
+	tcb support (incomplete):	$with_tcb
+	shadow group support:		$enable_shadowgrp
+	S/Key support:			$with_skey
+	SHA passwords encryption:	$with_sha_crypt
+	bcrypt passwords encryption:	$with_bcrypt
+	yescrypt passwords encryption:	$with_yescrypt
+	nscd support:			$with_nscd
+	sssd support:			$with_sssd
+	subordinate IDs support:	$enable_subids
+	enable lastlog:			$enable_lastlog
+	enable logind:			$enable_logind
+	use file caps:			$with_fcaps
+	install su:			$with_su
+	enabled vendor dir:             $enable_vendordir
+
+])
--- a/doc/HOWTO
+++ b/doc/HOWTO
@@ -346,7 +346,7 @@
  return value points to static data whose content is overwritten by
  each call.

-  Warning: The key space consists of 2**56 equal 7.2e16 possible values.
+  Warning: the key space consists of 2**56 equal 7.2e16 possible values.
  Exhaustive searches of this key space are possible using massively
  parallel computers.  Software, such as crack(1), is available which
  will search the portion of this key space that is generally used by
@@ -996,7 +996,7 @@
  sudo for the shadow suite, is available as at:
  <ftp://sunsite.unc.edu/pub/Linux/system/Admin/sudo-1.2-shadow.tgz>

-  Warning: When you install sudo your /etc/sudoers file will be replaced
+  Warning: when you install sudo your /etc/sudoers file will be replaced
  with a default one, so you need to make a backup of it if you have
  added anything to the default one.  (you could also edit the Makefile
  and remove the line that copies the default file to /etc).
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -133,6 +133,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_DISTCHECK_CONFIGURE_FLAGS = @AM_DISTCHECK_CONFIGURE_FLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -161,7 +162,6 @@ EGREP = @EGREP@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -205,7 +205,6 @@ LIBSYSTEMD = @LIBSYSTEMD@
 LIBTCB = @LIBTCB@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LIYESCRYPT = @LIYESCRYPT@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -222,6 +222,7 @@ am__relativize = \
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_DISTCHECK_CONFIGURE_FLAGS = @AM_DISTCHECK_CONFIGURE_FLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -250,7 +251,6 @@ EGREP = @EGREP@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -294,7 +294,6 @@ LIBSYSTEMD = @LIBSYSTEMD@
 LIBTCB = @LIBTCB@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LIYESCRYPT = @LIYESCRYPT@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
--- a/etc/login.defs
+++ b/etc/login.defs
@@ -6,7 +6,7 @@

 #
 # Delay in seconds before being allowed another attempt after a login failure
-# Note: When PAM is used, some modules may enforce a minimum delay (e.g.
+# Note: when PAM is used, some modules may enforce a minimum delay (e.g.
 #       pam_unix(8) enforces a 2s delay)
 #
 FAIL_DELAY		3
@@ -276,7 +276,7 @@ PASS_ALWAYS_WARN	yes
 #
 # Number of significant characters in the password for crypt().
 # Default is 8, don't change unless your crypt() is better.
-# Ignored if MD5_CRYPT_ENAB set to "yes".
+# Only used for DES encryption algorithm.
 #
 #PASS_MAX_LEN		8

@@ -308,7 +308,7 @@ CHFN_RESTRICT		rwh
 # Set to "no" if you need to copy encrypted passwords to other systems
 # which don't understand the new algorithm.  Default is "no".
 #
-# Note: If you use PAM, it is recommended to use a value consistent with
+# Note: if you use PAM, it is recommended to use a value consistent with
 # the PAM modules configuration.
 #
 # This variable is deprecated. You should use ENCRYPT_METHOD instead.
@@ -326,7 +326,7 @@ CHFN_RESTRICT		rwh
 # MD5 and DES should not be used for new hashes, see crypt(5) for recommendations.
 # Overrides the MD5_CRYPT_ENAB option
 #
-# Note: If you use PAM, it is recommended to use a value consistent with
+# Note: if you use PAM, it is recommended to use a value consistent with
 # the PAM modules configuration.
 #
 #ENCRYPT_METHOD DES
@@ -467,7 +467,7 @@ PREVENT_NO_AUTH superuser
 # Used in pam_timestamp module to calculate the keyed-hash message
 # authentication code.
 #
-# Note: It is recommended to check hmac(3) to see the possible algorithms
+# Note: it is recommended to check hmac(3) to see the possible algorithms
 # that are available in your system.
 #
 #HMAC_CRYPTO_ALGO SHA512
--- a/etc/pam.d/Makefile.in
+++ b/etc/pam.d/Makefile.in
@@ -165,6 +165,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_DISTCHECK_CONFIGURE_FLAGS = @AM_DISTCHECK_CONFIGURE_FLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -193,7 +194,6 @@ EGREP = @EGREP@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -237,7 +237,6 @@ LIBSYSTEMD = @LIBSYSTEMD@
 LIBTCB = @LIBTCB@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LIYESCRYPT = @LIYESCRYPT@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
--- a/etc/shadow-maint/Makefile.in
+++ b/etc/shadow-maint/Makefile.in
@@ -130,6 +130,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_DISTCHECK_CONFIGURE_FLAGS = @AM_DISTCHECK_CONFIGURE_FLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -158,7 +159,6 @@ EGREP = @EGREP@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -202,7 +202,6 @@ LIBSYSTEMD = @LIBSYSTEMD@
 LIBTCB = @LIBTCB@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LIYESCRYPT = @LIYESCRYPT@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,30 +37,10 @@ libshadow_la_SOURCES = \
 	alloc/realloc.h \
 	alloc/reallocf.c \
 	alloc/reallocf.h \
-	alloc/x/xcalloc.c \
-	alloc/x/xcalloc.h \
-	alloc/x/xmalloc.c \
-	alloc/x/xmalloc.h \
-	alloc/x/xrealloc.c \
-	alloc/x/xrealloc.h \
-	atoi/a2i/a2i.c \
-	atoi/a2i/a2i.h \
-	atoi/a2i/a2s.c \
-	atoi/a2i/a2s.h \
-	atoi/a2i/a2s_c.c \
-	atoi/a2i/a2s_c.h \
-	atoi/a2i/a2s_nc.c \
-	atoi/a2i/a2s_nc.h \
-	atoi/a2i/a2u.c \
-	atoi/a2i/a2u.h \
-	atoi/a2i/a2u_c.c \
-	atoi/a2i/a2u_c.h \
-	atoi/a2i/a2u_nc.c \
-	atoi/a2i/a2u_nc.h \
+	atoi/a2i.c \
+	atoi/a2i.h \
 	atoi/getnum.c \
 	atoi/getnum.h \
-	atoi/str2i.c \
-	atoi/str2i.h \
 	atoi/strtoi/strtoi.c \
 	atoi/strtoi/strtoi.h \
 	atoi/strtoi/strtou.c \
@@ -75,6 +55,8 @@ libshadow_la_SOURCES = \
 	cast.h \
 	chkname.c \
 	chkname.h \
+	chkhash.c \
+	chkhash.h \
 	chowndir.c \
 	chowntty.c \
 	cleanup.c \
@@ -88,6 +70,8 @@ libshadow_la_SOURCES = \
 	defines.h \
 	encrypt.c \
 	env.c \
+	exit_if_null.c \
+	exit_if_null.h \
 	exitcodes.h \
 	faillog.h \
 	failure.c \
@@ -99,7 +83,6 @@ libshadow_la_SOURCES = \
 	find_new_uid.c \
 	find_new_sub_gids.c \
 	find_new_sub_uids.c \
-	fputsx.c \
 	fs/mkstemp/fmkomstemp.c \
 	fs/mkstemp/fmkomstemp.h \
 	fs/mkstemp/mkomstemp.c \
@@ -117,7 +100,6 @@ libshadow_la_SOURCES = \
 	groupio.c \
 	groupmem.c \
 	groupio.h \
-	gshadow.c \
 	hushed.c \
 	idmapping.h \
 	idmapping.c \
@@ -165,13 +147,34 @@ libshadow_la_SOURCES = \
 	semanage.c \
 	setugid.c \
 	setupenv.c \
-	sgetgrent.c \
-	sgetpwent.c \
-	sgetspent.c \
 	sgroupio.c \
-	sgroupio.h\
+	sgroupio.h \
+	shadow/group/sgetgrent.c \
+	shadow/group/sgetgrent.h \
 	shadow/grp/agetgroups.c \
 	shadow/grp/agetgroups.h \
+	shadow/gshadow/endsgent.c \
+	shadow/gshadow/endsgent.h \
+	shadow/gshadow/fgetsgent.c \
+	shadow/gshadow/fgetsgent.h \
+	shadow/gshadow/getsgent.c \
+	shadow/gshadow/getsgent.h \
+	shadow/gshadow/getsgnam.c \
+	shadow/gshadow/getsgnam.h \
+	shadow/gshadow/gshadow.c \
+	shadow/gshadow/gshadow.h \
+	shadow/gshadow/putsgent.c \
+	shadow/gshadow/putsgent.h \
+	shadow/gshadow/setsgent.c \
+	shadow/gshadow/setsgent.h \
+	shadow/gshadow/sgetsgent.c \
+	shadow/gshadow/sgetsgent.h \
+	shadow/gshadow/sgrp.c \
+	shadow/gshadow/sgrp.h \
+	shadow/passwd/sgetpwent.c \
+	shadow/passwd/sgetpwent.h \
+	shadow/shadow/sgetspent.c \
+	shadow/shadow/sgetspent.h \
 	shadowio.c \
 	shadowio.h \
 	shadowlog.c \
@@ -199,8 +202,6 @@ libshadow_la_SOURCES = \
 	string/sprintf/snprintf.h \
 	string/sprintf/stpeprintf.c \
 	string/sprintf/stpeprintf.h \
-	string/sprintf/xaprintf.c \
-	string/sprintf/xaprintf.h \
 	string/strchr/strchrcnt.c \
 	string/strchr/strchrcnt.h \
 	string/strchr/strchrscnt.c \
@@ -213,6 +214,8 @@ libshadow_la_SOURCES = \
 	string/strcmp/strcaseprefix.h \
 	string/strcmp/streq.c \
 	string/strcmp/streq.h \
+	string/strcmp/strneq.c \
+	string/strcmp/strneq.h \
 	string/strcmp/strprefix.c \
 	string/strcmp/strprefix.h \
 	string/strcpy/stpecpy.c \
@@ -223,12 +226,14 @@ libshadow_la_SOURCES = \
 	string/strcpy/strncpy.h \
 	string/strcpy/strtcpy.c \
 	string/strcpy/strtcpy.h \
+	string/strdup/strdup.c \
+	string/strdup/strdup.h \
 	string/strdup/strndupa.c \
 	string/strdup/strndupa.h \
-	string/strdup/xstrdup.c \
-	string/strdup/xstrdup.h \
-	string/strdup/xstrndup.c \
-	string/strdup/xstrndup.h \
+	string/strdup/strndup.c \
+	string/strdup/strndup.h \
+	string/strerrno.c \
+	string/strerrno.h \
 	string/strftime.c \
 	string/strftime.h \
 	string/strspn/stpspn.c \
@@ -249,8 +254,6 @@ libshadow_la_SOURCES = \
 	string/strtok/strsep2arr.h \
 	string/strtok/strsep2ls.c \
 	string/strtok/strsep2ls.h \
-	string/strtok/xastrsep2ls.c \
-	string/strtok/xastrsep2ls.h \
 	strtoday.c \
 	sub.c \
 	subordinateio.h \
@@ -306,5 +309,4 @@ endif

 EXTRA_DIST = \
 	.indent.pro \
-	gshadow_.h \
 	xgetXXbyYY.c
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
--- a/lib/addgrps.c
+++ b/lib/addgrps.c
@@ -6,7 +6,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #if !defined(USE_PAM)

@@ -24,6 +24,8 @@
 #include "shadow/grp/agetgroups.h"
 #include "shadowlog.h"
 #include "string/strchr/strchrscnt.h"
+#include "string/strcmp/streq.h"
+#include "string/strerrno.h"


 /*
@@ -34,7 +36,7 @@
 int
 add_groups(const char *list)
 {
-	char    *g, *p, *dup;
+	char    *dup;
 	FILE *shadow_logfd = log_get_logfd();
 	gid_t   *gids;
 	size_t  n;
@@ -43,29 +45,34 @@ add_groups(const char *list)
 	if (gids == NULL)
 		return -1;

-	gids = REALLOCF(gids, n + strchrscnt(list, ",:") + 1, gid_t);
+	gids = reallocf_T(gids, n + strchrscnt(list, ",:") + 1, gid_t);
 	if (gids == NULL)
 		return -1;

-	p = dup = strdup(list);
+	dup = strdup(list);
 	if (dup == NULL)
 		goto free_gids;

-	while (NULL != (g = strsep(&p, ",:"))) {
-		struct group  *grp;
+	if (!streq(dup, "")) {
+		char  *g, *p;

-		grp = getgrnam(g); /* local, no need for xgetgrnam */
-		if (NULL == grp) {
-			fprintf(shadow_logfd, _("Warning: unknown group %s\n"), g);
-			continue;
+		p = dup;
+		while (NULL != (g = strsep(&p, ",:"))) {
+			struct group  *grp;
+
+			grp = getgrnam(g); /* local, no need for xgetgrnam */
+			if (NULL == grp) {
+				fprintf(shadow_logfd, _("Warning: unknown group %s\n"), g);
+				continue;
+			}
+
+			LSEARCH(gid_t, &grp->gr_gid, gids, &n);
 		}
-
-		LSEARCH(&grp->gr_gid, gids, &n);
 	}
 	free(dup);

 	if (setgroups(n, gids) == -1) {
-		fprintf(shadow_logfd, "setgroups: %s\n", strerror(errno));
+		fprintf(shadow_logfd, "setgroups: %s\n", strerrno());
 		goto free_gids;
 	}

--- a/lib/adds.c
+++ b/lib/adds.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "adds.h"

--- a/lib/adds.h
+++ b/lib/adds.h
@@ -6,7 +6,7 @@
 #define SHADOW_INCLUDE_LIB_ADDS_H_


-#include <config.h>
+#include "config.h"

 #include <errno.h>
 #include <limits.h>
@@ -55,7 +55,7 @@ addslN(size_t n, long addend[n])

 	e = errno;
 	while (n > 1) {
-		QSORT(addend, n);
+		QSORT(long, addend, n);

 		errno = 0;
 		addend[0] = addsl2(addend[0], addend[--n]);
--- a/lib/age.c
+++ b/lib/age.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include <sys/types.h>
 #include <stdio.h>
@@ -20,6 +20,7 @@
 #include "defines.h"
 #include "exitcodes.h"
 #include "prototypes.h"
+#include "shadow/gshadow/endsgent.h"


 #ident "$Id$"
--- a/lib/agetpass.c
+++ b/lib/agetpass.c
@@ -5,7 +5,7 @@
 */


-#include <config.h>
+#include "config.h"

 #include "agetpass.h"

@@ -106,7 +106,7 @@ agetpass_internal(const char *prompt, int flags)
 	 * Let's add one more byte, and if the password uses it, it
 	 * means the introduced password was longer than PASS_MAX.
 	 */
-	pass = MALLOC(PASS_MAX + 2, char);
+	pass = malloc_T(PASS_MAX + 2, char);
 	if (pass == NULL)
 		return NULL;

@@ -135,7 +135,7 @@ agetpass(const char *prompt)
 char *
 agetpass_stdin()
 {
-	return agetpass_internal(NULL, RPP_STDIN);
+	return agetpass_internal("", RPP_STDIN);
 }

 void
--- a/lib/agetpass.h
+++ b/lib/agetpass.h
@@ -8,7 +8,7 @@
 #define SHADOW_INCLUDE_LIB_AGETPASS_H_


-#include <config.h>
+#include "config.h"

 #include "attr.h"
 #include "defines.h"
--- a/lib/alloc/calloc.c
+++ b/lib/alloc/calloc.c
@@ -6,6 +6,6 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "alloc/calloc.h"
--- a/lib/alloc/calloc.h
+++ b/lib/alloc/calloc.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause


@@ -6,15 +6,24 @@
 #define SHADOW_INCLUDE_LIB_ALLOC_CALLOC_H_


-#include <config.h>
+#include "config.h"

 #include <stdlib.h>

+#include "exit_if_null.h"
+#include "sizeof.h"

-#define CALLOC(n, type)                                                       \
-(                                                                             \
-	(type *) calloc(n, sizeof(type))                                      \
-)
+
+// calloc_T - calloc type-safe
+#define calloc_T(n, T)   calloc_T_(n, typeas(T))
+#define calloc_T_(n, T)                                               \
+({                                                                    \
+	(T *){calloc(n, sizeof(T))};                                  \
+})
+
+
+// xcalloc_T - exit-on-error calloc type-safe
+#define xcalloc_T(n, T)  exit_if_null(calloc_T(n, T))


 #endif  // include guard
--- a/lib/alloc/malloc.c
+++ b/lib/alloc/malloc.c
@@ -6,7 +6,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "alloc/malloc.h"

--- a/lib/alloc/malloc.h
+++ b/lib/alloc/malloc.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause


@@ -6,19 +6,28 @@
 #define SHADOW_INCLUDE_LIB_ALLOC_MALLOC_H_


-#include <config.h>
+#include "config.h"

 #include <stdlib.h>

 #include "attr.h"
+#include "exit_if_null.h"
+#include "sizeof.h"


-#define MALLOC(n, type)                                                       \
-(                                                                             \
-	(type *) mallocarray(n, sizeof(type))                                 \
-)
+// malloc_T - malloc type-safe
+#define malloc_T(n, T)   malloc_T_(n, typeas(T))
+#define malloc_T_(n, T)                                               \
+({                                                                    \
+	(T *){mallocarray(n, sizeof(T))};                             \
+})


+// xmalloc_T - exit-on-error malloc type-safe
+#define xmalloc_T(n, T)  exit_if_null(malloc_T(n, T))
+
+
+// mallocarray - malloc array
 ATTR_ALLOC_SIZE(1, 2)
 ATTR_MALLOC(free)
 inline void *mallocarray(size_t nmemb, size_t size);
--- a/lib/alloc/realloc.c
+++ b/lib/alloc/realloc.c
@@ -6,6 +6,6 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "alloc/realloc.h"
--- a/lib/alloc/realloc.h
+++ b/lib/alloc/realloc.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause


@@ -6,15 +6,27 @@
 #define SHADOW_INCLUDE_LIB_ALLOC_REALLOC_H_


-#include <config.h>
+#include "config.h"

 #include <stdlib.h>

+#include "exit_if_null.h"
+#include "sizeof.h"

-#define REALLOC(p, n, type)                                                   \
-(                                                                             \
-	_Generic(p, type *: (type *) reallocarray(p, (n) ?: 1, sizeof(type))) \
-)
+
+// realloc_T - realloc type-safe
+#define realloc_T(p, n, T)   realloc_T_(p, n, typeas(T))
+#define realloc_T_(p, n, T)                                           \
+({                                                                    \
+	_Generic(p, T *: (void)0);                                    \
+	(T *){reallocarray_(p, n, sizeof(T))};                        \
+})
+
+#define reallocarray_(p, n, size)  reallocarray(p, (n) ?: 1, (size) ?: 1)
+
+
+// xrealloc_T - exit-on-error realloc type-safe
+#define xrealloc_T(p, n, T)  exit_if_null(realloc_T(p, n, T))


 #endif  // include guard
--- a/lib/alloc/reallocf.c
+++ b/lib/alloc/reallocf.c
@@ -6,7 +6,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "alloc/reallocf.h"

--- a/lib/alloc/reallocf.h
+++ b/lib/alloc/reallocf.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause


@@ -6,20 +6,27 @@
 #define SHADOW_INCLUDE_LIB_ALLOC_REALLOCF_H_


-#include <config.h>
+#include "config.h"

 #include <stddef.h>
 #include <stdlib.h>

 #include "attr.h"
+#include "sizeof.h"


-#define REALLOCF(p, n, type)                                                  \
-(                                                                             \
-	_Generic(p, type *: (type *) reallocarrayf(p, (n) ?: 1, sizeof(type)))\
-)
+// reallocf_T - realloc free-on-error type-safe
+#define reallocf_T(p, n, T)   reallocf_T_(p, n, typeas(T))
+#define reallocf_T_(p, n, T)                                          \
+({                                                                    \
+	_Generic(p, T *: (void)0);                                    \
+	(T *){reallocarrayf_(p, n, sizeof(T))};                       \
+})
+
+#define reallocarrayf_(p, n, size)  reallocarrayf(p, (n) ?: 1, (size) ?: 1)


+// reallocarrayf - realloc array free-on-error
 ATTR_ALLOC_SIZE(2, 3)
 ATTR_MALLOC(free)
 inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
--- a/lib/alloc/x/xcalloc.c
+++ b/lib/alloc/x/xcalloc.c
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
-// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
-// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
-// SPDX-FileCopyrightText: 2008     , Nicolas François
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "alloc/x/xcalloc.h"
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "defines.h"
-#include "shadowlog.h"
-
-
-void *
-xcalloc(size_t nmemb, size_t size)
-{
-	void  *p;
-
-	p = calloc(nmemb, size);
-	if (p == NULL)
-		goto x;
-
-	return p;
-
-x:
-	fprintf(log_get_logfd(), _("%s: %s\n"),
-	        log_get_progname(), strerror(errno));
-	exit(13);
-}
--- a/lib/alloc/x/xcalloc.h
+++ b/lib/alloc/x/xcalloc.h
@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_
-#define SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_
-
-
-#include <config.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "attr.h"
-
-
-#define XCALLOC(n, type)                                                      \
-(                                                                             \
-	(type *) xcalloc(n, sizeof(type))                                     \
-)
-
-
-ATTR_ALLOC_SIZE(1, 2)
-ATTR_MALLOC(free)
-void *xcalloc(size_t nmemb, size_t size);
-
-
-#endif  // include guard
--- a/lib/alloc/x/xmalloc.c
+++ b/lib/alloc/x/xmalloc.c
@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
-// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
-// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
-// SPDX-FileCopyrightText: 2008     , Nicolas François
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "alloc/x/xmalloc.h"
-
-#include <stddef.h>
-
-
-extern inline void *xmallocarray(size_t nmemb, size_t size);
--- a/lib/alloc/x/xmalloc.h
+++ b/lib/alloc/x/xmalloc.h
@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_
-#define SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_
-
-
-#include <config.h>
-
-#include <stddef.h>
-
-#include "alloc/x/xrealloc.h"
-#include "attr.h"
-
-
-#define XMALLOC(n, type)                                                      \
-(                                                                             \
-	(type *) xmallocarray(n, sizeof(type))                                \
-)
-
-
-ATTR_ALLOC_SIZE(1, 2)
-ATTR_MALLOC(free)
-inline void *xmallocarray(size_t nmemb, size_t size);
-
-
-inline void *
-xmallocarray(size_t nmemb, size_t size)
-{
-	return xreallocarray(NULL, nmemb, size);
-}
-
-
-#endif  // include guard
--- a/lib/alloc/x/xrealloc.c
+++ b/lib/alloc/x/xrealloc.c
@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
-// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
-// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
-// SPDX-FileCopyrightText: 2008     , Nicolas François
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "alloc/x/xrealloc.h"
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "alloc/reallocf.h"
-#include "defines.h"
-#include "shadowlog.h"
-
-
-void *
-xreallocarray(void *p, size_t nmemb, size_t size)
-{
-	p = reallocarrayf(p, nmemb, size);
-	if (p == NULL)
-		goto x;
-
-	return p;
-
-x:
-	fprintf(log_get_logfd(), _("%s: %s\n"),
-	        log_get_progname(), strerror(errno));
-	exit(13);
-}
--- a/lib/alloc/x/xrealloc.h
+++ b/lib/alloc/x/xrealloc.h
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_MALLOC_H_
-#define SHADOW_INCLUDE_LIB_MALLOC_H_
-
-
-#include <config.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "attr.h"
-
-
-#define XREALLOC(ptr, n, type)                                                \
-(                                                                             \
-	_Generic(ptr, type *:  (type *) xreallocarray(ptr, n, sizeof(type)))  \
-)
-
-
-ATTR_ALLOC_SIZE(2, 3)
-ATTR_MALLOC(free)
-void *xreallocarray(void *p, size_t nmemb, size_t size);
-
-
-#endif  // include guard
--- a/lib/atoi/str2i.c
+++ b/lib/atoi/str2i.c
@@ -1,8 +1,7 @@
-// SPDX-FileCopyrightText: 2007-2009, Nicolas François
 // SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

-#include "atoi/str2i.h"
+#include "atoi/a2i.h"
--- a/lib/atoi/a2i.h
+++ b/lib/atoi/a2i.h
@@ -0,0 +1,69 @@
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_H_
+
+
+#include "config.h"
+
+#include <errno.h>
+#include <stddef.h>
+
+#include "atoi/strtoi/strtoi.h"
+#include "atoi/strtoi/strtou_noneg.h"
+#include "typetraits.h"
+
+
+// a2i - alpha to integer
+#define a2i(T, n, s, endp, base, min, max)                            \
+({                                                                    \
+	T            *n_ = n;                                         \
+	QChar_of(s)  **endp_ = endp;                                  \
+	T            min_ = min;                                      \
+	T            max_ = max;                                      \
+	                                                              \
+	int  status;                                                  \
+	                                                              \
+	*n_ = _Generic((T){0},                                        \
+		short:              strtoi_,                          \
+		int:                strtoi_,                          \
+		long:               strtoi_,                          \
+		long long:          strtoi_,                          \
+		unsigned short:     strtou_noneg,                     \
+		unsigned int:       strtou_noneg,                     \
+		unsigned long:      strtou_noneg,                     \
+		unsigned long long: strtou_noneg                      \
+	)(s, (char **) endp_, base, min_, max_, &status);             \
+	                                                              \
+	if (status != 0)                                              \
+		errno = status;                                       \
+	-!!status;                                                    \
+})
+
+
+#define a2sh(...)   a2i(short, __VA_ARGS__)
+#define a2si(...)   a2i(int, __VA_ARGS__)
+#define a2sl(...)   a2i(long, __VA_ARGS__)
+#define a2sll(...)  a2i(long long, __VA_ARGS__)
+
+#define a2uh(...)   a2i(unsigned short, __VA_ARGS__)
+#define a2ui(...)   a2i(unsigned int, __VA_ARGS__)
+#define a2ul(...)   a2i(unsigned long, __VA_ARGS__)
+#define a2ull(...)  a2i(unsigned long long, __VA_ARGS__)
+
+#define str2i(T, ...)  a2i(T, __VA_ARGS__, NULL, 0, type_min(T), type_max(T))
+
+#define str2sh(...)    str2i(short, __VA_ARGS__)
+#define str2si(...)    str2i(int, __VA_ARGS__)
+#define str2sl(...)    str2i(long, __VA_ARGS__)
+#define str2sll(...)   str2i(long long, __VA_ARGS__)
+
+#define str2uh(...)    str2i(unsigned short, __VA_ARGS__)
+#define str2ui(...)    str2i(unsigned int, __VA_ARGS__)
+#define str2ul(...)    str2i(unsigned long, __VA_ARGS__)
+#define str2ull(...)   str2i(unsigned long long, __VA_ARGS__)
+
+
+#endif  // include guard
--- a/lib/atoi/a2i/a2i.h
+++ b/lib/atoi/a2i/a2i.h
@@ -1,62 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2I_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2I_H_
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2s_c.h"
-#include "atoi/a2i/a2s_nc.h"
-#include "atoi/a2i/a2u_c.h"
-#include "atoi/a2i/a2u_nc.h"
-
-
-/*
- * See the manual of these macros in liba2i's documentation:
- * <http://www.alejandro-colomar.es/share/dist/liba2i/git/HEAD/liba2i-HEAD.pdf>
- */
-
-
-#define a2i(TYPE, n, s, ...)                                                  \
-(                                                                             \
-	_Generic((void (*)(TYPE, typeof(s))) 0,                               \
-		void (*)(short,              const char *):  a2sh_c,          \
-		void (*)(short,              const void *):  a2sh_c,          \
-		void (*)(short,              char *):        a2sh_nc,         \
-		void (*)(short,              void *):        a2sh_nc,         \
-		void (*)(int,                const char *):  a2si_c,          \
-		void (*)(int,                const void *):  a2si_c,          \
-		void (*)(int,                char *):        a2si_nc,         \
-		void (*)(int,                void *):        a2si_nc,         \
-		void (*)(long,               const char *):  a2sl_c,          \
-		void (*)(long,               const void *):  a2sl_c,          \
-		void (*)(long,               char *):        a2sl_nc,         \
-		void (*)(long,               void *):        a2sl_nc,         \
-		void (*)(long long,          const char *):  a2sll_c,         \
-		void (*)(long long,          const void *):  a2sll_c,         \
-		void (*)(long long,          char *):        a2sll_nc,        \
-		void (*)(long long,          void *):        a2sll_nc,        \
-		void (*)(unsigned short,     const char *):  a2uh_c,          \
-		void (*)(unsigned short,     const void *):  a2uh_c,          \
-		void (*)(unsigned short,     char *):        a2uh_nc,         \
-		void (*)(unsigned short,     void *):        a2uh_nc,         \
-		void (*)(unsigned int,       const char *):  a2ui_c,          \
-		void (*)(unsigned int,       const void *):  a2ui_c,          \
-		void (*)(unsigned int,       char *):        a2ui_nc,         \
-		void (*)(unsigned int,       void *):        a2ui_nc,         \
-		void (*)(unsigned long,      const char *):  a2ul_c,          \
-		void (*)(unsigned long,      const void *):  a2ul_c,          \
-		void (*)(unsigned long,      char *):        a2ul_nc,         \
-		void (*)(unsigned long,      void *):        a2ul_nc,         \
-		void (*)(unsigned long long, const char *):  a2ull_c,         \
-		void (*)(unsigned long long, const void *):  a2ull_c,         \
-		void (*)(unsigned long long, char *):        a2ull_nc,        \
-		void (*)(unsigned long long, void *):        a2ull_nc         \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-
-#endif  // include guard
--- a/lib/atoi/a2i/a2s.c
+++ b/lib/atoi/a2i/a2s.c
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2s.h"
--- a/lib/atoi/a2i/a2s.h
+++ b/lib/atoi/a2i/a2s.h
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_H_
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2i.h"
-
-
-#define a2sh(...)   a2i(short, __VA_ARGS__)
-#define a2si(...)   a2i(int, __VA_ARGS__)
-#define a2sl(...)   a2i(long, __VA_ARGS__)
-#define a2sll(...)  a2i(long long, __VA_ARGS__)
-
-
-#endif  // include guard
--- a/lib/atoi/a2i/a2s_c.c
+++ b/lib/atoi/a2i/a2s_c.c
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2s_c.h"
-
-
-extern inline int a2sh_c(short *restrict n, const char *s,
-    const char **restrict endp, int base, short min, short max);
-extern inline int a2si_c(int *restrict n, const char *s,
-    const char **restrict endp, int base, int min, int max);
-extern inline int a2sl_c(long *restrict n, const char *s,
-    const char **restrict endp, int base, long min, long max);
-extern inline int a2sll_c(long long *restrict n, const char *s,
-    const char **restrict endp, int base, long long min, long long max);
--- a/lib/atoi/a2i/a2s_c.h
+++ b/lib/atoi/a2i/a2s_c.h
@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_C_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_C_H_
-
-
-#include <config.h>
-
-#include <errno.h>
-#include <inttypes.h>
-
-#include "atoi/a2i/a2s_nc.h"
-#include "attr.h"
-
-
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sh_c(short *restrict n, const char *s,
-    const char **restrict endp, int base, short min, short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2si_c(int *restrict n, const char *s,
-    const char **restrict endp, int base, int min, int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sl_c(long *restrict n, const char *s,
-    const char **restrict endp, int base, long min, long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sll_c(long long *restrict n, const char *s,
-    const char **restrict endp, int base, long long min, long long max);
-
-
-inline int
-a2sh_c(short *restrict n, const char *s,
-    const char **restrict endp, int base, short min, short max)
-{
-	return a2sh_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2si_c(int *restrict n, const char *s,
-    const char **restrict endp, int base, int min, int max)
-{
-	return a2si_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2sl_c(long *restrict n, const char *s,
-    const char **restrict endp, int base, long min, long max)
-{
-	return a2sl_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2sll_c(long long *restrict n, const char *s,
-    const char **restrict endp, int base, long long min, long long max)
-{
-	return a2sll_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-#endif  // include guard
--- a/lib/atoi/a2i/a2s_nc.c
+++ b/lib/atoi/a2i/a2s_nc.c
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2s_nc.h"
-
-
-extern inline int a2sh_nc(short *restrict n, char *s,
-    char **restrict endp, int base, short min, short max);
-extern inline int a2si_nc(int *restrict n, char *s,
-    char **restrict endp, int base, int min, int max);
-extern inline int a2sl_nc(long *restrict n, char *s,
-    char **restrict endp, int base, long min, long max);
-extern inline int a2sll_nc(long long *restrict n, char *s,
-    char **restrict endp, int base, long long min, long long max);
--- a/lib/atoi/a2i/a2s_nc.h
+++ b/lib/atoi/a2i/a2s_nc.h
@@ -1,91 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_NC_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_NC_H_
-
-
-#include <config.h>
-
-#include <errno.h>
-
-#include "atoi/strtoi/strtoi.h"
-#include "attr.h"
-
-
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sh_nc(short *restrict n, char *s,
-    char **restrict endp, int base, short min, short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2si_nc(int *restrict n, char *s,
-    char **restrict endp, int base, int min, int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sl_nc(long *restrict n, char *s,
-    char **restrict endp, int base, long min, long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sll_nc(long long *restrict n, char *s,
-    char **restrict endp, int base, long long min, long long max);
-
-
-inline int
-a2sh_nc(short *restrict n, char *s,
-    char **restrict endp, int base, short min, short max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2si_nc(int *restrict n, char *s,
-    char **restrict endp, int base, int min, int max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2sl_nc(long *restrict n, char *s,
-    char **restrict endp, int base, long min, long max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2sll_nc(long long *restrict n, char *s,
-    char **restrict endp, int base, long long min, long long max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-#endif  // include guard
--- a/lib/atoi/a2i/a2u.c
+++ b/lib/atoi/a2i/a2u.c
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2u.h"
--- a/lib/atoi/a2i/a2u.h
+++ b/lib/atoi/a2i/a2u.h
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_H_
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2i.h"
-
-
-#define a2uh(...)   a2i(unsigned short, __VA_ARGS__)
-#define a2ui(...)   a2i(unsigned int, __VA_ARGS__)
-#define a2ul(...)   a2i(unsigned long, __VA_ARGS__)
-#define a2ull(...)  a2i(unsigned long long, __VA_ARGS__)
-
-
-#endif  // include guard
--- a/lib/atoi/a2i/a2u_c.c
+++ b/lib/atoi/a2i/a2u_c.c
@@ -1,19 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2u_c.h"
-
-
-extern inline int a2uh_c(unsigned short *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned short min,
-    unsigned short max);
-extern inline int a2ui_c(unsigned int *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned int min, unsigned int max);
-extern inline int a2ul_c(unsigned long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long min, unsigned long max);
-extern inline int a2ull_c(unsigned long long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
--- a/lib/atoi/a2i/a2u_c.h
+++ b/lib/atoi/a2i/a2u_c.h
@@ -1,65 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_C_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_C_H_
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2u_nc.h"
-#include "attr.h"
-
-
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2uh_c(unsigned short *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned short min,
-    unsigned short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ui_c(unsigned int *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned int min, unsigned int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ul_c(unsigned long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long min, unsigned long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ull_c(unsigned long long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
-
-
-inline int
-a2uh_c(unsigned short *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned short min,
-    unsigned short max)
-{
-	return a2uh_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2ui_c(unsigned int *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned int min, unsigned int max)
-{
-	return a2ui_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2ul_c(unsigned long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long min, unsigned long max)
-{
-	return a2ul_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2ull_c(unsigned long long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long long min,
-    unsigned long long max)
-{
-	return a2ull_nc(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-#endif  // include guard
--- a/lib/atoi/a2i/a2u_nc.c
+++ b/lib/atoi/a2i/a2u_nc.c
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/a2i/a2u_nc.h"
-
-
-extern inline int a2uh_nc(unsigned short *restrict n, char *s,
-    char **restrict endp, int base, unsigned short min, unsigned short max);
-extern inline int a2ui_nc(unsigned int *restrict n, char *s,
-    char **restrict endp, int base, unsigned int min, unsigned int max);
-extern inline int a2ul_nc(unsigned long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long min, unsigned long max);
-extern inline int a2ull_nc(unsigned long long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
--- a/lib/atoi/a2i/a2u_nc.h
+++ b/lib/atoi/a2i/a2u_nc.h
@@ -1,94 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_NC_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_NC_H_
-
-
-#include <config.h>
-
-#include <errno.h>
-
-#include "atoi/strtoi/strtou_noneg.h"
-#include "attr.h"
-
-
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2uh_nc(unsigned short *restrict n, char *s,
-    char **restrict endp, int base, unsigned short min, unsigned short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ui_nc(unsigned int *restrict n, char *s,
-    char **restrict endp, int base, unsigned int min, unsigned int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ul_nc(unsigned long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long min, unsigned long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ull_nc(unsigned long long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
-
-
-inline int
-a2uh_nc(unsigned short *restrict n, char *s,
-    char **restrict endp, int base, unsigned short min,
-    unsigned short max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2ui_nc(unsigned int *restrict n, char *s,
-    char **restrict endp, int base, unsigned int min, unsigned int max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2ul_nc(unsigned long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long min, unsigned long max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2ull_nc(unsigned long long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long long min,
-    unsigned long long max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-#endif  // include guard
--- a/lib/atoi/getnum.c
+++ b/lib/atoi/getnum.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include <sys/types.h>

--- a/lib/atoi/getnum.h
+++ b/lib/atoi/getnum.h
@@ -7,14 +7,13 @@
 #define SHADOW_INCLUDE_LIB_ATOI_GETNUM_H_


-#include <config.h>
+#include "config.h"

 #include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>

-#include "atoi/a2i/a2i.h"
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "attr.h"
 #include "typetraits.h"

--- a/lib/atoi/str2i.h
+++ b/lib/atoi/str2i.h
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2007-2009, Nicolas François
-// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_STR2I_H_
-#define SHADOW_INCLUDE_LIB_ATOI_STR2I_H_
-
-
-#include <config.h>
-
-#include <stddef.h>
-
-#include "atoi/a2i/a2i.h"
-#include "typetraits.h"
-
-
-#define str2i(T, ...)  a2i(T, __VA_ARGS__, NULL, 0, type_min(T), type_max(T))
-
-#define str2sh(...)    str2i(short, __VA_ARGS__)
-#define str2si(...)    str2i(int, __VA_ARGS__)
-#define str2sl(...)    str2i(long, __VA_ARGS__)
-#define str2sll(...)   str2i(long long, __VA_ARGS__)
-
-#define str2uh(...)    str2i(unsigned short, __VA_ARGS__)
-#define str2ui(...)    str2i(unsigned int, __VA_ARGS__)
-#define str2ul(...)    str2i(unsigned long, __VA_ARGS__)
-#define str2ull(...)   str2i(unsigned long long, __VA_ARGS__)
-
-
-#endif  // include guard
--- a/lib/atoi/strtoi/strtoi.c
+++ b/lib/atoi/strtoi/strtoi.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "atoi/strtoi/strtoi.h"

--- a/lib/atoi/strtoi/strtoi.h
+++ b/lib/atoi/strtoi/strtoi.h
@@ -6,7 +6,7 @@
 #define SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOI_H_


-#include <config.h>
+#include "config.h"

 #include <errno.h>
 #include <inttypes.h>
--- a/lib/atoi/strtoi/strtou.c
+++ b/lib/atoi/strtoi/strtou.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "atoi/strtoi/strtou.h"

--- a/lib/atoi/strtoi/strtou.h
+++ b/lib/atoi/strtoi/strtou.h
@@ -6,7 +6,7 @@
 #define SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOU_H_


-#include <config.h>
+#include "config.h"

 #include <errno.h>
 #include <inttypes.h>
--- a/lib/atoi/strtoi/strtou_noneg.c
+++ b/lib/atoi/strtoi/strtou_noneg.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause


-#include <config.h>
+#include "config.h"

 #include "atoi/strtoi/strtou_noneg.h"

--- a/lib/atoi/strtoi/strtou_noneg.h
+++ b/lib/atoi/strtoi/strtou_noneg.h
@@ -6,7 +6,7 @@
 #define SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOU_NONEG_H_


-#include <config.h>
+#include "config.h"

 #include <errno.h>
 #include <stddef.h>
--- a/lib/attr.h
+++ b/lib/attr.h
@@ -5,17 +5,38 @@
 #include "config.h"


-#if (__GNUC__ >= 10)
-# define MAYBE_UNUSED                [[gnu::unused]]
-# define NORETURN                    [[gnu::__noreturn__]]
-# define format_attr(type, fmt, va)  [[gnu::format(type, fmt, va)]]
-# define ATTR_ACCESS(...)            [[gnu::access(__VA_ARGS__)]]
-# define ATTR_ALLOC_SIZE(...)        [[gnu::alloc_size(__VA_ARGS__)]]
+#if !defined(__has_c_attribute)
+# define __has_c_attribute(x)  0
+#endif
+
+
+#if __has_c_attribute(maybe_unused)
+# define MAYBE_UNUSED                [[maybe_unused]]
 #else
 # define MAYBE_UNUSED
+#endif
+
+#if __has_c_attribute(noreturn)
+# define NORETURN                    [[noreturn]]
+#else
 # define NORETURN
+#endif
+
+#if __has_c_attribute(gnu::format)
+# define format_attr(type, fmt, va)  [[gnu::format(type, fmt, va)]]
+#else
 # define format_attr(type, fmt, va)
+#endif
+
+#if __has_c_attribute(gnu::access)
+# define ATTR_ACCESS(...)            [[gnu::access(__VA_ARGS__)]]
+#else
 # define ATTR_ACCESS(...)
+#endif
+
+#if __has_c_attribute(gnu::alloc_size)
+# define ATTR_ALLOC_SIZE(...)        [[gnu::alloc_size(__VA_ARGS__)]]
+#else
 # define ATTR_ALLOC_SIZE(...)
 #endif

@@ -25,11 +46,17 @@
 # define ATTR_MALLOC(deallocator)
 #endif

-#if (__GNUC__ >= 14)
+#if __has_c_attribute(gnu::null_terminated_string_arg)
 # define ATTR_STRING(i)              [[gnu::null_terminated_string_arg(i)]]
 #else
 # define ATTR_STRING(i)
 #endif

+#if __has_c_attribute(gnu::nonstring)
+# define ATTR_NONSTRING              [[gnu::nonstring]]
+#else
+# define ATTR_NONSTRING
+#endif
+

 #endif  // include guard
--- a/lib/audit_help.c
+++ b/lib/audit_help.c
@@ -11,7 +11,7 @@
 *
 */

-#include <config.h>
+#include "config.h"

 #ifdef WITH_AUDIT

@@ -56,13 +56,12 @@ void audit_help_open (void)
 *
 * type - type of message. A list of possible values is available in
 *        "audit-records.h" file.
- * pgname - program's name
 * op  -  operation. "adding user", "changing finger info", "deleting group"
 * name - user's account or group name. If not available use NULL.
 * id  -  uid or gid that the operation is being performed on. This is used
 *	  only when user is NULL.
 */
-void audit_logger (int type, MAYBE_UNUSED const char *pgname, const char *op,
+void audit_logger (int type, const char *op,
                   const char *name, unsigned int id,
                   shadow_audit_result result)
 {
@@ -105,10 +104,10 @@ audit_logger_with_group(int type, const char *op, const char *name,

 	len = strnlen(grp, sizeof(enc_group)/2);
 	if (audit_value_needs_encoding(grp, len)) {
-		SNPRINTF(buf, "%s %s=%s", op, grp_type,
+		stprintf_a(buf, "%s %s=%s", op, grp_type,
 			audit_encode_value(enc_group, grp, len));
 	} else {
-		SNPRINTF(buf, "%s %s=\"%s\"", op, grp_type, grp);
+		stprintf_a(buf, "%s %s=\"%s\"", op, grp_type, grp);
 	}

 	audit_log_acct_message(audit_fd, type, NULL, buf, name, id,
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -11,7 +11,7 @@
 * --marekm
 */

-#include <config.h>
+#include "config.h"

 #include <stddef.h>
 #include <stdlib.h>
--- a/lib/bit.c
+++ b/lib/bit.c
@@ -5,7 +5,7 @@
 */


-#include <config.h>
+#include "config.h"

 #ident "$Id$"

--- a/lib/bit.h
+++ b/lib/bit.h
@@ -9,7 +9,7 @@
 #define SHADOW_INCLUDE_LIB_BIT_H_


-#include <config.h>
+#include "config.h"

 #include <limits.h>

--- a/lib/cast.h
+++ b/lib/cast.h
@@ -6,7 +6,7 @@
 #define SHADOW_INCLUDE_LIB_CAST_H_


-#include <config.h>
+#include "config.h"


 #define const_cast(T, p)  _Generic(p, const T:  (T) (p))
--- a/lib/chkhash.c
+++ b/lib/chkhash.c
@@ -0,0 +1,82 @@
+#include "config.h"
+
+#include "chkhash.h"
+
+#include <regex.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "string/strcmp/streq.h"
+#include "string/strcmp/strprefix.h"
+
+
+/*
+ * match_regex - return true if match, false if not
+ */
+bool 
+match_regex(const char *pattern, const char *string) 
+{
+	regex_t regex;
+	int result;
+
+	if (regcomp(&regex, pattern, REG_EXTENDED) != 0)
+		return false;
+
+	result = regexec(&regex, string, 0, NULL, 0);
+	regfree(&regex);
+
+	return result == 0;
+}
+
+
+/*
+ * is_valid_hash - check if the given string is a valid password hash
+ *
+ * Returns true if the string appears to be a valid hash, false otherwise.
+ *
+ * regex from: https://man.archlinux.org/man/crypt.5.en
+ */
+bool 
+is_valid_hash(const char *hash) 
+{
+	hash = strprefix(hash, "!") ?: hash;
+
+	// Passwordless account; discouraged
+	if (streq(hash, ""))
+		return true;
+
+	if (streq(hash, "*"))
+		return true;
+
+	// Minimum hash length
+	if (strlen(hash) < 13)
+		return false;
+
+	// Yescrypt: $y$ + algorithm parameters + $ + salt + $ + 43-char (minimum) hash
+	if (match_regex("^\\$y\\$[./A-Za-z0-9]+\\$[./A-Za-z0-9]{1,86}\\$[./A-Za-z0-9]{43}$", hash))
+		return true;
+
+	// Bcrypt: $2[abxy]$ + 2-digit cost + $ + 53-char hash
+	if (match_regex("^\\$2[abxy]\\$[0-9]{2}\\$[./A-Za-z0-9]{53}$", hash))
+		return true;
+
+	// SHA-512: $6$ + salt + $ + 86-char hash
+	if (match_regex("^\\$6\\$(rounds=[1-9][0-9]{3,8}\\$)?[^$:\\n]{1,16}\\$[./A-Za-z0-9]{86}$", hash))
+		return true;
+
+	// SHA-256: $5$ + salt + $ + 43-char hash
+	if (match_regex("^\\$5\\$(rounds=[1-9][0-9]{3,8}\\$)?[^$:\\n]{1,16}\\$[./A-Za-z0-9]{43}$", hash))
+		return true;
+
+	// MD5: $1$ + salt + $ + 22-char hash
+	if (match_regex("^\\$1\\$[^$:\\n]{1,8}\\$[./A-Za-z0-9]{22}$", hash))
+		return true;
+
+	// DES: exactly 13 characters from [A-Za-z0-9./]
+	if (match_regex("^[./A-Za-z0-9]{13}$", hash))
+		return true;
+
+	// Not a valid hash
+	return false;
+}
--- a/lib/chkhash.h
+++ b/lib/chkhash.h
@@ -0,0 +1,13 @@
+#ifndef SHADOW_INCLUDE_CHKHASH_H
+#define SHADOW_INCLUDE_CHKHASH_H
+
+
+#include "config.h"
+
+#include <stdbool.h>
+
+
+bool is_valid_hash(const char *hash);
+
+
+#endif
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -13,12 +13,13 @@
 *   true  - OK
 *   false - bad name
 * errors:
- *   EINVAL	Invalid name characters or sequences
+ *   EINVAL	Invalid name
+ *   EILSEQ	Invalid name character sequence (acceptable with --badname)
 *   EOVERFLOW	Name longer than maximum size
 */


-#include <config.h>
+#include "config.h"

 #ident "$Id$"

@@ -27,12 +28,15 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <string.h>
 #include <unistd.h>

 #include "defines.h"
 #include "chkname.h"
+#include "string/ctype/strchrisascii/strchriscntrl.h"
 #include "string/ctype/strisascii/strisdigit.h"
 #include "string/strcmp/streq.h"
+#include "string/strcmp/strcaseeq.h"


 #ifndef  LOGIN_NAME_MAX
@@ -59,35 +63,37 @@ login_name_max_size(void)
 static bool
 is_valid_name(const char *name)
 {
+	if (streq(name, "")
+	 || streq(name, ".")
+	 || streq(name, "..")
+	 || strspn(name, "-")
+	 || strpbrk(name, " \"#',/:;")
+	 || strchriscntrl(name)
+	 || strisdigit(name))
+	{
+		errno = EINVAL;
+		return false;
+	}
+
 	if (allow_bad_names) {
 		return true;
 	}

 	/*
-         * User/group names must match BRE regex:
-         *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]*$\?
-         *
-         * as a non-POSIX, extension, allow "$" as the last char for
-         * sake of Samba 3.x "add machine script"
-         *
-         * Also do not allow fully numeric names or just "." or "..".
-         */
+	 * User/group names must match BRE regex:
+	 *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]*$\?
+	 *
+	 * as a non-POSIX, extension, allow "$" as the last char for
+	 * sake of Samba 3.x "add machine script"
+	 */

-	if (strisdigit(name)) {
-		errno = EINVAL;
-		return false;
-	}
-
-	if (streq(name, "") ||
-	    streq(name, ".") ||
-	    streq(name, "..") ||
-	    !((*name >= 'a' && *name <= 'z') ||
+	if (!((*name >= 'a' && *name <= 'z') ||
 	      (*name >= 'A' && *name <= 'Z') ||
 	      (*name >= '0' && *name <= '9') ||
 	      *name == '_' ||
 	      *name == '.'))
 	{
-		errno = EINVAL;
+		errno = EILSEQ;
 		return false;
 	}

@@ -101,7 +107,7 @@ is_valid_name(const char *name)
 		      streq(name, "$")
 		     ))
 		{
-			errno = EINVAL;
+			errno = EILSEQ;
 			return false;
 		}
 	}
--- a/lib/chkname.h
+++ b/lib/chkname.h
@@ -21,7 +21,7 @@
 */


-#include <config.h>
+#include "config.h"

 #include <stdbool.h>
 #include <stddef.h>
--- a/lib/chowndir.c
+++ b/lib/chowndir.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

--- a/lib/chowntty.c
+++ b/lib/chowntty.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

--- a/lib/cleanup.c
+++ b/lib/cleanup.c
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include <assert.h>
 #include <stdio.h>
--- a/lib/cleanup_group.c
+++ b/lib/cleanup_group.c
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include <assert.h>
 #include <stdio.h>
@@ -27,7 +27,7 @@ void cleanup_report_add_group (void *group_name)

 	SYSLOG ((LOG_ERR, "failed to add group %s", name));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_ADD_GROUP, log_get_progname(),
+	audit_logger (AUDIT_ADD_GROUP,
 	              "",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -45,7 +45,7 @@ void cleanup_report_del_group (void *group_name)

 	SYSLOG ((LOG_ERR, "failed to remove group %s", name));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_DEL_GROUP, log_get_progname(),
+	audit_logger (AUDIT_DEL_GROUP,
 	              "",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -62,7 +62,7 @@ void cleanup_report_mod_group (void *cleanup_info)
 	         gr_dbname (),
 	         info->action));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_GRP_MGMT, log_get_progname(),
+	audit_logger (AUDIT_GRP_MGMT,
 	              info->audit_msg,
 	              info->name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -80,7 +80,7 @@ void cleanup_report_mod_gshadow (void *cleanup_info)
 	         sgr_dbname (),
 	         info->action));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_GRP_MGMT, log_get_progname(),
+	audit_logger (AUDIT_GRP_MGMT,
 	              info->audit_msg,
 	              info->name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -100,7 +100,7 @@ void cleanup_report_add_group_group (void *group_name)

 	SYSLOG ((LOG_ERR, "failed to add group %s to %s", name, gr_dbname ()));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_ADD_GROUP, log_get_progname(),
+	audit_logger (AUDIT_ADD_GROUP,
 	              "adding-group",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -120,7 +120,7 @@ void cleanup_report_add_group_gshadow (void *group_name)

 	SYSLOG ((LOG_ERR, "failed to add group %s to %s", name, sgr_dbname ()));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_GRP_MGMT, log_get_progname(),
+	audit_logger (AUDIT_GRP_MGMT,
 	              "adding-shadow-group",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -143,7 +143,7 @@ void cleanup_report_del_group_group (void *group_name)
 	         "failed to remove group %s from %s",
 	         name, gr_dbname ()));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_DEL_GROUP, log_get_progname(),
+	audit_logger (AUDIT_DEL_GROUP,
 	              "removing-group",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -166,7 +166,7 @@ void cleanup_report_del_group_gshadow (void *group_name)
 	         "failed to remove group %s from %s",
 	         name, sgr_dbname ()));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_GRP_MGMT, log_get_progname(),
+	audit_logger (AUDIT_GRP_MGMT,
 	              "removing-shadow-group",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -179,9 +179,11 @@ void cleanup_report_del_group_gshadow (void *group_name)
 *
 * It should be registered after the group file is successfully locked.
 */
-void cleanup_unlock_group (MAYBE_UNUSED void *arg)
+void cleanup_unlock_group (void *process_selinux)
 {
-	if (gr_unlock () == 0) {
+	bool process = *((bool *) process_selinux);
+
+	if (gr_unlock (process) == 0) {
 		fprintf (log_get_logfd(),
 		         _("%s: failed to unlock %s\n"),
 		         log_get_progname(), gr_dbname ());
@@ -199,9 +201,11 @@ void cleanup_unlock_group (MAYBE_UNUSED void *arg)
 *
 * It should be registered after the gshadow file is successfully locked.
 */
-void cleanup_unlock_gshadow (MAYBE_UNUSED void *arg)
+void cleanup_unlock_gshadow (void *process_selinux)
 {
-	if (sgr_unlock () == 0) {
+	bool process = *((bool *) process_selinux);
+
+	if (sgr_unlock (process) == 0) {
 		fprintf (log_get_logfd(),
 		         _("%s: failed to unlock %s\n"),
 		         log_get_progname(), sgr_dbname ());
--- a/lib/cleanup_user.c
+++ b/lib/cleanup_user.c
@@ -4,12 +4,11 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include <assert.h>
 #include <stdio.h>

-#include "attr.h"
 #include "defines.h"
 #include "pwio.h"
 #include "shadowio.h"
@@ -27,7 +26,7 @@ void cleanup_report_add_user (void *user_name)

 	SYSLOG ((LOG_ERR, "failed to add user %s", name));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_ADD_USER, log_get_progname(),
+	audit_logger (AUDIT_ADD_USER,
 	              "",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -44,7 +43,7 @@ void cleanup_report_mod_passwd (void *cleanup_info)
 	         pw_dbname (),
 	         info->action));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_MGMT, log_get_progname(),
+	audit_logger (AUDIT_USER_MGMT,
 	              info->audit_msg,
 	              info->name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -64,7 +63,7 @@ void cleanup_report_add_user_passwd (void *user_name)

 	SYSLOG ((LOG_ERR, "failed to add user %s to %s", name, pw_dbname ()));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_ADD_USER, log_get_progname(),
+	audit_logger (AUDIT_ADD_USER,
 	              "adding-user",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -84,7 +83,7 @@ void cleanup_report_add_user_shadow (void *user_name)

 	SYSLOG ((LOG_ERR, "failed to add user %s to %s", name, spw_dbname ()));
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_MGMT, log_get_progname(),
+	audit_logger (AUDIT_USER_MGMT,
 	              "adding-shadow-user",
 	              name, AUDIT_NO_ID,
 	              SHADOW_AUDIT_FAILURE);
@@ -96,9 +95,11 @@ void cleanup_report_add_user_shadow (void *user_name)
 *
 * It should be registered after the passwd database is successfully locked.
 */
-void cleanup_unlock_passwd (MAYBE_UNUSED void *arg)
+void cleanup_unlock_passwd (void *process_selinux)
 {
-	if (pw_unlock () == 0) {
+	bool process = *((bool *) process_selinux);
+
+	if (pw_unlock (process) == 0) {
 		fprintf (log_get_logfd(),
 		         _("%s: failed to unlock %s\n"),
 		         log_get_progname(), pw_dbname ());
@@ -115,9 +116,11 @@ void cleanup_unlock_passwd (MAYBE_UNUSED void *arg)
 *
 * It should be registered after the shadow database is successfully locked.
 */
-void cleanup_unlock_shadow (MAYBE_UNUSED void *arg)
+void cleanup_unlock_shadow (void *process_selinux)
 {
-	if (spw_unlock () == 0) {
+	bool process = *((bool *) process_selinux);
+
+	if (spw_unlock (process) == 0) {
 		fprintf (log_get_logfd(),
 		         _("%s: failed to unlock %s\n"),
 		         log_get_progname(), spw_dbname ());
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

@@ -16,6 +16,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <signal.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -23,7 +24,6 @@
 #include <utime.h>

 #include "alloc/malloc.h"
-#include "alloc/reallocf.h"
 #include "atoi/getnum.h"
 #include "commonio.h"
 #include "defines.h"
@@ -39,6 +39,7 @@
 #include "string/sprintf/snprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
+#include "string/strerrno.h"
 #include "string/strtok/stpsep.h"


@@ -102,7 +103,7 @@ static int check_link_count (const char *file, bool log)
 		if (log) {
 			(void) fprintf (shadow_logfd,
 			                "%s: %s file stat error: %s\n",
-			                shadow_progname, file, strerror (errno));
+			                shadow_progname, file, strerrno());
 		}
 		return 0;
 	}
@@ -133,19 +134,19 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 		if (log) {
 			(void) fprintf (shadow_logfd,
 			                "%s: %s: %s\n",
-			                shadow_progname, file, strerror (errno));
+			                shadow_progname, file, strerrno());
 		}
 		return 0;
 	}

 	pid = getpid ();
-	SNPRINTF(buf, "%lu", (unsigned long) pid);
+	stprintf_a(buf, "%lu", (unsigned long) pid);
 	len = (ssize_t) strlen (buf) + 1;
 	if (write_full(fd, buf, len) == -1) {
 		if (log) {
 			(void) fprintf (shadow_logfd,
 			                "%s: %s file write error: %s\n",
-			                shadow_progname, file, strerror (errno));
+			                shadow_progname, file, strerrno());
 		}
 		(void) close (fd);
 		unlink (file);
@@ -155,7 +156,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 		if (log) {
 			(void) fprintf (shadow_logfd,
 			                "%s: %s file sync error: %s\n",
-			                shadow_progname, file, strerror (errno));
+			                shadow_progname, file, strerrno());
 		}
 		(void) close (fd);
 		unlink (file);
@@ -174,13 +175,13 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 		if (log) {
 			(void) fprintf (shadow_logfd,
 			                "%s: %s: %s\n",
-			                shadow_progname, lock, strerror (errno));
+			                shadow_progname, lock, strerrno());
 		}
 		unlink (file);
 		errno = EINVAL;
 		return 0;
 	}
-	len = read (fd, buf, sizeof (buf) - 1);
+	len = read(fd, buf, sizeof(buf) - 1);
 	close (fd);
 	if (len <= 0) {
 		if (log) {
@@ -217,7 +218,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 		if (log) {
 			(void) fprintf (shadow_logfd,
 			                "%s: cannot get lock %s: %s\n",
-			                shadow_progname, lock, strerror (errno));
+			                shadow_progname, lock, strerrno());
 		}
 		unlink (file);
 		return 0;
@@ -230,7 +231,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 		if (log) {
 			(void) fprintf (shadow_logfd,
 			                "%s: cannot get lock %s: %s\n",
-			                shadow_progname, lock, strerror (errno));
+			                shadow_progname, lock, strerrno());
 		}
 	}

@@ -328,9 +329,8 @@ static void free_linked_list (struct commonio_db *db)

 		free (p->line);

-		if (NULL != p->eptr) {
-			db->ops->free (p->eptr);
-		}
+		if (NULL != p->eptr)
+			db->ops->cio_free(p->eptr);

 		free (p);
 	}
@@ -340,7 +340,7 @@ static void free_linked_list (struct commonio_db *db)

 int commonio_setname (struct commonio_db *db, const char *name)
 {
-	SNPRINTF(db->filename, "%s", name);
+	stprintf_a(db->filename, "%s", name);
 	db->setname = true;
 	return 1;
 }
@@ -467,13 +467,13 @@ static void dec_lock_count (void)
 }


-int commonio_unlock (struct commonio_db *db)
+int commonio_unlock (struct commonio_db *db, bool process_selinux)
 {
 	char  lock[1029];

 	if (db->isopen) {
 		db->readonly = true;
-		if (commonio_close (db) == 0) {
+		if (commonio_close (db, process_selinux) == 0) {
 			if (db->locked) {
 				dec_lock_count ();
 			}
@@ -486,7 +486,7 @@ int commonio_unlock (struct commonio_db *db)
 		 * then call ulckpwdf() (if used) on last unlock.
 		 */
 		db->locked = false;
-		SNPRINTF(lock, "%s.lock", db->filename);
+		stprintf_a(lock, "%s.lock", db->filename);
 		unlink (lock);
 		dec_lock_count ();
 		return 1;
@@ -548,7 +548,7 @@ static void add_one_entry_nis (struct commonio_db *db,
 	struct commonio_entry *p;

 	for (p = db->head; NULL != p; p = p->next) {
-		if (name_is_nis (p->eptr ? db->ops->getname (p->eptr)
+		if (name_is_nis (p->eptr ? db->ops->cio_getname(p->eptr)
 		                         : p->line)) {
 			/*@-mustfreeonly@*/
 			newp->next = p;
@@ -567,11 +567,9 @@ static void add_one_entry_nis (struct commonio_db *db,
 }
 #endif				/* KEEP_NIS_AT_END */

-/* Initial buffer size, as well as increment if not sufficient
-   (for reading very long lines in group files).  */
-#define BUFLEN 4096

-int commonio_open (struct commonio_db *db, int mode)
+int
+commonio_open(struct commonio_db *db, int mode)
 {
 	char *buf;
 	char *line;
@@ -633,31 +631,12 @@ int commonio_open (struct commonio_db *db, int mode)
 		return 0;
 	}

-	buflen = BUFLEN;
-	buf = MALLOC(buflen, char);
-	if (NULL == buf)
-		goto cleanup_errno;
-
-	while (db->ops->fgets (buf, buflen, db->fp) == buf) {
+	buf = NULL;
+	while (getline(&buf, &buflen, db->fp) != -1) {
 		struct commonio_entry  *p;

-		while (   (strrchr (buf, '\n') == NULL)
-		       && (feof (db->fp) == 0)) {
-			size_t len;
-
-			buflen += BUFLEN;
-			buf = REALLOCF(buf, buflen, char);
-			if (NULL == buf)
-				goto cleanup_errno;
-
-			len = strlen (buf);
-			if (db->ops->fgets (buf + len,
-			                    (int) (buflen - len),
-			                    db->fp) == NULL) {
-				goto cleanup_buf;
-			}
-		}
-		stpsep(buf, "\n");
+		if (stpsep(buf, "\n") == NULL)
+			goto cleanup_buf;

 		line = strdup (buf);
 		if (NULL == line) {
@@ -667,16 +646,16 @@ int commonio_open (struct commonio_db *db, int mode)
 		if (name_is_nis (line)) {
 			eptr = NULL;
 		} else {
-			eptr = db->ops->parse (line);
+			eptr = db->ops->cio_parse(line);
 			if (NULL != eptr) {
-				eptr = db->ops->dup (eptr);
+				eptr = db->ops->cio_dup(eptr);
 				if (NULL == eptr) {
 					goto cleanup_line;
 				}
 			}
 		}

-		p = MALLOC(1, struct commonio_entry);
+		p = malloc_T(1, struct commonio_entry);
 		if (NULL == p) {
 			goto cleanup_entry;
 		}
@@ -694,7 +673,7 @@ int commonio_open (struct commonio_db *db, int mode)
 		goto cleanup_errno;
 	}

-	if ((NULL != db->ops->open_hook) && (db->ops->open_hook () == 0)) {
+	if ((NULL != db->ops->cio_open_hook) && (db->ops->cio_open_hook() == 0)) {
 		goto cleanup_errno;
 	}

@@ -702,9 +681,8 @@ int commonio_open (struct commonio_db *db, int mode)
 	return 1;

      cleanup_entry:
-	if (NULL != eptr) {
-		db->ops->free (eptr);
-	}
+	if (NULL != eptr)
+		db->ops->cio_free(eptr);
      cleanup_line:
 	free (line);
      cleanup_buf:
@@ -719,6 +697,7 @@ int commonio_open (struct commonio_db *db, int mode)
 	return 0;
 }

+
 /*
 * Sort given db according to cmp function (usually compares uids)
 */
@@ -752,7 +731,7 @@ commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *))
 		return 0;
 	}

-	entries = MALLOC(n, struct commonio_entry *);
+	entries = malloc_T(n, struct commonio_entry *);
 	if (entries == NULL) {
 		return -1;
 	}
@@ -771,7 +750,7 @@ commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *))
 		entries[n] = ptr;
 		n++;
 	}
-	qsort (entries, n, sizeof (struct commonio_entry *), cmp);
+	qsort(entries, n, sizeof(struct commonio_entry *), cmp);

 	/* Take care of the head and tail separately */
 	db->head = entries[0];
@@ -820,14 +799,14 @@ int commonio_sort_wrt (struct commonio_db *shadow,
 		if (NULL == pw_ptr->eptr) {
 			continue;
 		}
-		name = passwd->ops->getname (pw_ptr->eptr);
+		name = passwd->ops->cio_getname(pw_ptr->eptr);
 		for (spw_ptr = shadow->head;
 		     NULL != spw_ptr;
 		     spw_ptr = spw_ptr->next) {
 			if (NULL == spw_ptr->eptr) {
 				continue;
 			}
-			if (streq(name, shadow->ops->getname(spw_ptr->eptr)))
+			if (streq(name, shadow->ops->cio_getname(spw_ptr->eptr)))
 				break;
 		}
 		if (NULL == spw_ptr) {
@@ -869,13 +848,13 @@ static int write_all (const struct commonio_db *db)
 		if (p->changed) {
 			eptr = p->eptr;
 			assert (NULL != eptr);
-			if (db->ops->put (eptr, db->fp) != 0) {
+			if (db->ops->cio_put(eptr, db->fp) != 0) {
 				return -1;
 			}
 		} else if (NULL != p->line) {
-			if (db->ops->fputs (p->line, db->fp) == EOF) {
+			if (fputs(p->line, db->fp) == EOF)
 				return -1;
-			}
+
 			if (putc ('\n', db->fp) == EOF) {
 				return -1;
 			}
@@ -885,7 +864,8 @@ static int write_all (const struct commonio_db *db)
 }


-int commonio_close (struct commonio_db *db)
+int
+commonio_close(struct commonio_db *db, MAYBE_UNUSED bool process_selinux)
 {
 	bool         errors = false;
 	char         buf[1024];
@@ -905,11 +885,11 @@ int commonio_close (struct commonio_db *db)
 		goto success;
 	}

-	if ((NULL != db->ops->close_hook) && (db->ops->close_hook () == 0)) {
+	if ((NULL != db->ops->cio_close_hook) && (db->ops->cio_close_hook() == 0)) {
 		goto fail;
 	}

-	memzero (&sb, sizeof sb);
+	memzero(&sb, sizeof(sb));
 	if (NULL != db->fp) {
 		if (fstat (fileno (db->fp), &sb) != 0) {
 			(void) fclose (db->fp);
@@ -920,14 +900,15 @@ int commonio_close (struct commonio_db *db)
 		/*
 		 * Create backup file.
 		 */
-		if (SNPRINTF(buf, "%s-", db->filename) == -1) {
+		if (stprintf_a(buf, "%s-", db->filename) == -1) {
 			(void) fclose (db->fp);
 			db->fp = NULL;
 			goto fail;
 		}

 #ifdef WITH_SELINUX
-		if (set_selinux_file_context (db->filename, S_IFREG) != 0) {
+		if (process_selinux
+		    && set_selinux_file_context (db->filename, S_IFREG) != 0) {
 			errors = true;
 		}
 #endif
@@ -942,7 +923,8 @@ int commonio_close (struct commonio_db *db)
 		db->fp = NULL;

 #ifdef WITH_SELINUX
-		if (reset_selinux_file_context () != 0) {
+		if (process_selinux
+		    && reset_selinux_file_context () != 0) {
 			errors = true;
 		}
 #endif
@@ -957,11 +939,12 @@ int commonio_close (struct commonio_db *db)
 		sb.st_gid = db->st_gid;
 	}

-	if (SNPRINTF(buf, "%s+", db->filename) == -1)
+	if (stprintf_a(buf, "%s+", db->filename) == -1)
 		goto fail;

 #ifdef WITH_SELINUX
-	if (set_selinux_file_context (db->filename, S_IFREG) != 0) {
+	if (process_selinux
+	    && set_selinux_file_context (db->filename, S_IFREG) != 0) {
 		errors = true;
 	}
 #endif
@@ -999,7 +982,8 @@ int commonio_close (struct commonio_db *db)
 	}

 #ifdef WITH_SELINUX
-	if (reset_selinux_file_context () != 0) {
+	if (process_selinux
+	    && reset_selinux_file_context () != 0) {
 		goto fail;
 	}
 #endif
@@ -1029,7 +1013,7 @@ static /*@dependent@*/ /*@null@*/struct commonio_entry *next_entry_by_name (
 	for (p = pos; NULL != p; p = p->next) {
 		ep = p->eptr;
 		if (   (NULL != ep)
-		    && streq(db->ops->getname(ep), name)) {
+		    && streq(db->ops->cio_getname(ep), name)) {
 			break;
 		}
 	}
@@ -1053,19 +1037,19 @@ int commonio_update (struct commonio_db *db, const void *eptr)
 		errno = EINVAL;
 		return 0;
 	}
-	nentry = db->ops->dup (eptr);
+	nentry = db->ops->cio_dup(eptr);
 	if (NULL == nentry) {
 		errno = ENOMEM;
 		return 0;
 	}
-	p = find_entry_by_name (db, db->ops->getname (eptr));
+	p = find_entry_by_name(db, db->ops->cio_getname(eptr));
 	if (NULL != p) {
-		if (next_entry_by_name (db, p->next, db->ops->getname (eptr)) != NULL) {
-			fprintf (shadow_logfd, _("Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"), db->ops->getname (eptr), db->filename);
-			db->ops->free (nentry);
+		if (next_entry_by_name(db, p->next, db->ops->cio_getname(eptr)) != NULL) {
+			fprintf(shadow_logfd, _("Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"), db->ops->cio_getname(eptr), db->filename);
+			db->ops->cio_free(nentry);
 			return 0;
 		}
-		db->ops->free (p->eptr);
+		db->ops->cio_free(p->eptr);
 		p->eptr = nentry;
 		p->changed = true;
 		db->cursor = p;
@@ -1074,9 +1058,9 @@ int commonio_update (struct commonio_db *db, const void *eptr)
 		return 1;
 	}
 	/* not found, new entry */
-	p = MALLOC(1, struct commonio_entry);
+	p = malloc_T(1, struct commonio_entry);
 	if (NULL == p) {
-		db->ops->free (nentry);
+		db->ops->cio_free(nentry);
 		errno = ENOMEM;
 		return 0;
 	}
@@ -1105,15 +1089,15 @@ int commonio_append (struct commonio_db *db, const void *eptr)
 		errno = EINVAL;
 		return 0;
 	}
-	nentry = db->ops->dup (eptr);
+	nentry = db->ops->cio_dup(eptr);
 	if (NULL == nentry) {
 		errno = ENOMEM;
 		return 0;
 	}
 	/* new entry */
-	p = MALLOC(1, struct commonio_entry);
+	p = malloc_T(1, struct commonio_entry);
 	if (NULL == p) {
-		db->ops->free (nentry);
+		db->ops->cio_free(nentry);
 		errno = ENOMEM;
 		return 0;
 	}
@@ -1174,9 +1158,8 @@ int commonio_remove (struct commonio_db *db, const char *name)

 	free (p->line);

-	if (NULL != p->eptr) {
-		db->ops->free (p->eptr);
-	}
+	if (NULL != p->eptr)
+		db->ops->cio_free(p->eptr);

 	free(p);

--- a/lib/commonio.h
+++ b/lib/commonio.h
@@ -35,39 +35,30 @@ struct commonio_ops {
 	 * Make a copy of the object (for example, struct passwd)
 	 * and all strings pointed by it, in malloced memory.
 	 */
-	/*@null@*/ /*@only@*/void *(*dup) (const void *);
+	/*@null@*/ /*@only@*/void *(*cio_dup)(const void *);

 	/*
 	 * free() the object including any strings pointed by it.
 	 */
-	void (*free)(/*@only@*/void *);
+	void (*cio_free)(/*@only@*/void *);

 	/*
 	 * Return the name of the object (for example, pw_name
 	 * for struct passwd).
 	 */
-	const char *(*getname) (const void *);
+	const char *(*cio_getname)(const void *);

 	/*
 	 * Parse a string, return object (in static area -
 	 * should be copied using the dup operation above).
 	 */
-	void *(*parse) (const char *);
+	void *(*cio_parse)(const char *);

 	/*
 	 * Write the object to the file (this calls putpwent()
 	 * for struct passwd, for example).
 	 */
-	int (*put) (const void *, FILE *);
-
-	/*
-	 * fgets and fputs (can be replaced by versions that
-	 * understand line continuation conventions).
-	 */
-	ATTR_ACCESS(write_only, 1, 2)
-	/*@null@*/char *(*fgets)(/*@returned@*/char *restrict s, int n,
-	                         FILE *restrict stream);
-	int (*fputs) (const char *, FILE *);
+	int (*cio_put)(const void *, FILE *);

 	/*
 	 * open_hook and close_hook.
@@ -75,8 +66,8 @@ struct commonio_ops {
 	 * is open or before it is closed.
 	 * They return 0 on failure and 1 on success.
 	 */
-	/*@null@*/int (*open_hook) (void);
-	/*@null@*/int (*close_hook) (void);
+	/*@null@*/int (*cio_open_hook)(void);
+	/*@null@*/int (*cio_close_hook)(void);
 };

 /*
@@ -103,7 +94,7 @@ struct commonio_db {
 #endif
 	/*
 	 * Default permissions and owner for newly created data file.
-         */
+	 */
 	mode_t st_mode;
 	uid_t st_uid;
 	gid_t st_gid;
@@ -138,8 +129,8 @@ extern int commonio_append (struct commonio_db *, const void *);
 extern int commonio_remove (struct commonio_db *, const char *);
 extern int commonio_rewind (struct commonio_db *);
 extern /*@observer@*/ /*@null@*/const void *commonio_next (struct commonio_db *);
-extern int commonio_close (struct commonio_db *);
-extern int commonio_unlock (struct commonio_db *);
+extern int commonio_close (struct commonio_db *, bool);
+extern int commonio_unlock (struct commonio_db *, bool);
 extern void commonio_del_entry (struct commonio_db *,
                                const struct commonio_entry *);
 extern int commonio_sort_wrt (struct commonio_db *shadow,
--- a/lib/console.c
+++ b/lib/console.c
@@ -8,7 +8,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include <stdio.h>
 #include <string.h>
@@ -52,7 +52,7 @@ is_listed(const char *cfgin, const char *tty, bool def)
 	if (*cons != '/') {
 		char *pbuf;

-		STRTCPY(buf, cons);
+		strtcpy_a(buf, cons);
 		pbuf = buf;
 		while (NULL != (s = strsep(&pbuf, ":"))) {
 			if (streq(s, tty)) {
@@ -76,7 +76,7 @@ is_listed(const char *cfgin, const char *tty, bool def)
 	 * See if this tty is listed in the console file.
 	 */

-	while (fgets (buf, sizeof (buf), fp) != NULL) {
+	while (fgets(buf, sizeof(buf), fp) != NULL) {
 		stpsep(buf, "\n");
 		if (streq(buf, tty)) {
 			(void) fclose (fp);
--- a/lib/copydir.c
+++ b/lib/copydir.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>

-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "attr.h"
 #include "fs/readlink/areadlink.h"
 #include "prototypes.h"
@@ -39,9 +39,9 @@
 #endif				/* WITH_ATTR */
 #include "shadowlog.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/xaprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
+#include "string/strerrno.h"


 static /*@null@*/const char *src_orig;
@@ -72,12 +72,10 @@ static int copy_dir (const struct path_info *src, const struct path_info *dst,
                     uid_t old_uid, uid_t new_uid,
                     gid_t old_gid, gid_t new_gid);
 static int copy_symlink (const struct path_info *src, const struct path_info *dst,
-                         MAYBE_UNUSED bool reset_selinux,
                         const struct stat *statp, const struct timespec mt[],
                         uid_t old_uid, uid_t new_uid,
                         gid_t old_gid, gid_t new_gid);
 static int copy_hardlink (const struct path_info *dst,
-                          MAYBE_UNUSED bool reset_selinux,
                          struct link_name *lp);
 static int copy_special (const struct path_info *src, const struct path_info *dst,
                         bool reset_selinux,
@@ -101,7 +99,8 @@ static int fchown_if_needed (int fdst, const struct stat *statp,
 * error_acl - format the error messages for the ACL and EQ libraries.
 */
 format_attr(printf, 2, 3)
-static void error_acl (MAYBE_UNUSED struct error_context *ctx, const char *fmt, ...)
+static void
+error_acl(struct error_context *, const char *fmt, ...)
 {
 	va_list ap;
 	FILE *shadow_logfd = log_get_logfd();
@@ -118,7 +117,7 @@ static void error_acl (MAYBE_UNUSED struct error_context *ctx, const char *fmt,
 	if (vfprintf (shadow_logfd, fmt, ap) != 0) {
 		(void) fputs (_(": "), shadow_logfd);
 	}
-	(void) fprintf (shadow_logfd, "%s\n", strerror (errno));
+	(void) fprintf(shadow_logfd, "%s\n", strerrno());
 	va_end (ap);
 }

@@ -230,7 +229,7 @@ static /*@exposed@*/ /*@null@*/struct link_name *check_link (const char *name, c
 		return NULL;
 	}

-	lp = XMALLOC(1, struct link_name);
+	lp = xmalloc_T(1, struct link_name);
 	lp->ln_dev = sb->st_dev;
 	lp->ln_ino = sb->st_ino;
 	lp->ln_count = sb->st_nlink;
@@ -310,7 +309,7 @@ static int copy_tree_impl (const struct path_info *src, const struct path_info *
 		dst_orig = dst->full_path;
 		set_orig = true;
 	}
-	while ((0 == err) && (ent = readdir (dir)) != NULL) {
+	while (0 == err && NULL != (ent = readdir(dir))) {
 		char              *src_name = NULL;
 		char              *dst_name;
 		struct path_info  src_entry, dst_entry;
@@ -437,7 +436,7 @@ static int copy_entry (const struct path_info *src, const struct path_info *dst,
 	*/

 	else if (S_ISLNK (sb.st_mode)) {
-		err = copy_symlink (src, dst, reset_selinux, &sb, mt,
+		err = copy_symlink (src, dst, &sb, mt,
 				    old_uid, new_uid, old_gid, new_gid);
 	}

@@ -446,7 +445,7 @@ static int copy_entry (const struct path_info *src, const struct path_info *dst,
 	*/

 	else if ((lp = check_link (src->full_path, &sb)) != NULL) {
-		err = copy_hardlink (dst, reset_selinux, lp);
+		err = copy_hardlink (dst, lp);
 	}

 	/*
@@ -502,14 +501,14 @@ static int copy_dir (const struct path_info *src, const struct path_info *dst,
 		return -1;
 	}
 #endif				/* WITH_SELINUX */
-        /*
-         * If the destination is already a directory, don't change it
-         * but copy into it (recursively).
-        */
-        if (fstatat(dst->dirfd, dst->name, &dst_sb, AT_SYMLINK_NOFOLLOW) == 0 && S_ISDIR(dst_sb.st_mode)) {
-            return (copy_tree_impl (src, dst, false, reset_selinux,
-                           old_uid, new_uid, old_gid, new_gid) != 0);
-        }
+	/*
+	 * If the destination is already a directory, don't change it
+	 * but copy into it (recursively).
+	 */
+	if (fstatat(dst->dirfd, dst->name, &dst_sb, AT_SYMLINK_NOFOLLOW) == 0 && S_ISDIR(dst_sb.st_mode)) {
+		return (copy_tree_impl (src, dst, false, reset_selinux,
+		               old_uid, new_uid, old_gid, new_gid) != 0);
+	}

 	if (   (mkdirat (dst->dirfd, dst->name, 0700) != 0)
 	    || (chownat_if_needed (dst, statp,
@@ -551,7 +550,6 @@ static int copy_dir (const struct path_info *src, const struct path_info *dst,
 *	Return 0 on success, -1 on error.
 */
 static int copy_symlink (const struct path_info *src, const struct path_info *dst,
-                         MAYBE_UNUSED bool reset_selinux,
                         const struct stat *statp, const struct timespec mt[],
                         uid_t old_uid, uid_t new_uid,
                         gid_t old_gid, gid_t new_gid)
@@ -622,7 +620,6 @@ static int copy_symlink (const struct path_info *src, const struct path_info *ds
 *	Return 0 on success, -1 on error.
 */
 static int copy_hardlink (const struct path_info *dst,
-                          MAYBE_UNUSED bool reset_selinux,
                          struct link_name *lp)
 {
 	/* FIXME: selinux, ACL, Extended Attributes needed? */
@@ -653,8 +650,8 @@ static int copy_hardlink (const struct path_info *dst,
 *	Return 0 on success, -1 on error.
 */
 static int
-copy_special(const struct path_info *src, const struct path_info *dst,
-             bool reset_selinux,
+copy_special(MAYBE_UNUSED const struct path_info *src, const struct path_info *dst,
+             MAYBE_UNUSED bool reset_selinux,
             const struct stat *statp, const struct timespec mt[],
             uid_t old_uid, uid_t new_uid,
             gid_t old_gid, gid_t new_gid)
@@ -709,7 +706,7 @@ copy_special(const struct path_info *src, const struct path_info *dst,
 *	Return 0 on success, -1 on error.
 */
 static int copy_file (const struct path_info *src, const struct path_info *dst,
-                      bool reset_selinux,
+                      MAYBE_UNUSED bool reset_selinux,
                      const struct stat *statp, const struct timespec mt[],
                      uid_t old_uid, uid_t new_uid,
                      gid_t old_gid, gid_t new_gid)
@@ -761,7 +758,7 @@ static int copy_file (const struct path_info *src, const struct path_info *dst,
 		char buf[8192];
 		ssize_t cnt;

-		cnt = read (ifd, buf, sizeof buf);
+		cnt = read(ifd, buf, sizeof(buf));
 		if (cnt < 0) {
 			if (errno == EINTR) {
 				continue;
@@ -801,7 +798,7 @@ static int chown_function ## _if_needed (type_dst dst,                 \
 {                                                                      \
 	uid_t tmpuid = (uid_t) -1;                                     \
 	gid_t tmpgid = (gid_t) -1;                                     \
-                                                                       \
+	                                                               \
 	/* Use new_uid if old_uid is set to -1 or if the file was      \
 	 * owned by the user. */                                       \
 	if (((uid_t) -1 == old_uid) || (statp->st_uid == old_uid)) {   \
@@ -812,14 +809,14 @@ static int chown_function ## _if_needed (type_dst dst,                 \
 	if ((uid_t) -1 == tmpuid) {                                    \
 		tmpuid = statp->st_uid;                                \
 	}                                                              \
-                                                                       \
+	                                                               \
 	if (((gid_t) -1 == old_gid) || (statp->st_gid == old_gid)) {   \
 		tmpgid = new_gid;                                      \
 	}                                                              \
 	if ((gid_t) -1 == tmpgid) {                                    \
 		tmpgid = statp->st_gid;                                \
 	}                                                              \
-                                                                       \
+	                                                               \
 	return chown_function (dst, tmpuid, tmpgid);                   \
 }

--- a/lib/csrand.c
+++ b/lib/csrand.c
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

--- a/lib/defines.h
+++ b/lib/defines.h
@@ -51,20 +51,9 @@
 #include <dirent.h>

 #include <shadow.h>
-#if defined(SHADOWGRP)
-#include "gshadow_.h"
-#endif

 #include <limits.h>

-#ifndef	NGROUPS_MAX
-#ifdef	NGROUPS
-#define	NGROUPS_MAX	NGROUPS
-#else
-#define	NGROUPS_MAX	64
-#endif
-#endif
-
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
@@ -79,11 +68,6 @@
 #define LOG_WARN LOG_WARNING
 #endif

-/* LOG_NOWAIT is deprecated */
-#ifndef LOG_NOWAIT
-#define LOG_NOWAIT 0
-#endif
-
 /* LOG_AUTH is deprecated, use LOG_AUTHPRIV instead */
 #ifndef LOG_AUTHPRIV
 #define LOG_AUTHPRIV LOG_AUTH
@@ -97,7 +81,7 @@
   syslogd should log the current system time for each event, and not
   trust the formatted time received from the unix domain (or worse,
   UDP) socket.  -MM */
-/* Avoid translated PAM error messages: Set LC_ALL to "C".
+/* Avoid translated PAM error messages: set LC_ALL to "C".
 * --Nekral */
 #define SYSLOG(x)							\
 	do {								\
@@ -123,7 +107,7 @@
   in just one place.  */

 #ifndef SYSLOG_OPTIONS
-/* #define SYSLOG_OPTIONS (LOG_PID | LOG_CONS | LOG_NOWAIT) */
+/* #define SYSLOG_OPTIONS (LOG_PID | LOG_CONS) */
 #define SYSLOG_OPTIONS (LOG_PID)
 #endif

@@ -160,10 +144,6 @@
 #define GROUP_FILE "/etc/group"
 #endif

-#ifndef SHADOW_FILE
-#define SHADOW_FILE "/etc/shadow"
-#endif
-
 #ifndef SUBUID_FILE
 #define SUBUID_FILE "/etc/subuid"
 #endif
@@ -172,12 +152,6 @@
 #define SUBGID_FILE "/etc/subgid"
 #endif

-#ifdef SHADOWGRP
-#ifndef SGROUP_FILE
-#define SGROUP_FILE "/etc/gshadow"
-#endif
-#endif
-
 /*
 * string to use for the pw_passwd field in /etc/passwd when using
 * shadow passwords - most systems use "x" but there are a few
--- a/lib/encrypt.c
+++ b/lib/encrypt.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

--- a/lib/env.c
+++ b/lib/env.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

@@ -16,15 +16,16 @@
 #include <stdlib.h>
 #include <string.h>

-#include "alloc/x/xmalloc.h"
-#include "alloc/x/xrealloc.h"
+#include "alloc/malloc.h"
+#include "alloc/realloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "shadowlog.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"


 /*
@@ -67,7 +68,7 @@ static const char *const noslash[] = {
 */
 void initenv (void)
 {
-	newenvp = XMALLOC(NEWENVP_STEP, char *);
+	newenvp = xmalloc_T(NEWENVP_STEP, char *);
 	*newenvp = NULL;
 }

@@ -134,7 +135,7 @@ void addenv (const char *string, /*@null@*/const char *value)

 		update_environ = (environ == newenvp);

-		newenvp = XREALLOC(newenvp, newenvc + NEWENVP_STEP, char *);
+		newenvp = xrealloc_T(newenvp, newenvc + NEWENVP_STEP, char *);

 		/*
 		 * If this is our current environment, update
@@ -163,13 +164,13 @@ void set_env (int argc, char *const *argv)
 	char  *cp;

 	for (; argc > 0; argc--, argv++) {
-		if (strlen (*argv) >= sizeof variable) {
+		if (strlen(*argv) >= sizeof(variable)) {
 			continue;	/* ignore long entries */
 		}

 		cp = strchr (*argv, '=');
 		if (NULL == cp) {
-			assert(SNPRINTF(variable, "L%d", noname) != -1);
+			assert(stprintf_a(variable, "L%d", noname) != -1);
 			noname++;
 			addenv (variable, *argv);
 		} else {
@@ -226,9 +227,9 @@ void sanitize_env (void)
 			if (!strprefix(*cur, *bad)) {
 				continue;
 			}
-			if (strchr (*cur, '/') == NULL) {
+			if (!strchr(*cur, '/'))
 				continue;	/* OK */
-			}
+
 			for (move = cur; NULL != *move; move++) {
 				*move = *(move + 1);
 			}
--- a/lib/exit_if_null.c
+++ b/lib/exit_if_null.c
@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include "config.h"
+
+#include "exit_if_null.h"
+
+
+extern inline void exit_if_null_(void *p);
--- a/lib/exit_if_null.h
+++ b/lib/exit_if_null.h
@@ -0,0 +1,48 @@
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_EXIT_IF_NULL_H_
+#define SHADOW_INCLUDE_LIB_EXIT_IF_NULL_H_
+
+
+#include "config.h"
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "shadowlog.h"
+#include "string/strerrno.h"
+
+
+/*
+ * This macro is used for implementing x*() variants of functions that
+ * allocate memory, such as xstrdup() for wrapping strdup(3).  The macro
+ * returns the input pointer transparently, with the same type, but
+ * calls exit(3) if the input is a null pointer (thus, if the allocation
+ * failed).
+ */
+#define exit_if_null(p)                                               \
+({                                                                    \
+	__auto_type  p_ = p;                                          \
+	                                                              \
+	exit_if_null_(p_);                                            \
+	p_;                                                           \
+})
+
+
+inline void exit_if_null_(void *p);
+
+
+inline void
+exit_if_null_(void *p)
+{
+	if (p == NULL) {
+		fprintf(log_get_logfd(), "%s: %s\n", log_get_progname(), strerrno());
+		exit(13);
+	}
+}
+
+
+#endif  // include guard
--- a/lib/failure.c
+++ b/lib/failure.c
@@ -7,7 +7,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ident "$Id$"

@@ -34,7 +34,7 @@
 void failure (uid_t uid, const char *tty, struct faillog *fl)
 {
 	int fd;
-	off_t offset_uid = (off_t) (sizeof *fl) * uid;
+	off_t offset_uid = (off_t) sizeof(*fl) * uid;

 	/*
 	 * Don't do anything if failure logging isn't set up.
@@ -59,7 +59,7 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
 	 */

 	if (   (lseek (fd, offset_uid, SEEK_SET) != offset_uid)
-	    || (read (fd, fl, sizeof *fl) != (ssize_t) sizeof *fl)) {
+	    || (read(fd, fl, sizeof(*fl)) != (ssize_t) sizeof(*fl))) {
 		/* This is not necessarily a failure. The file is
 		 * initially zero length.
 		 *
@@ -67,7 +67,7 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
 		 * might reset the counter. But the new failure will be
 		 * logged.
 		 */
-		memzero (fl, sizeof *fl);
+		memzero(fl, sizeof(*fl));
 	}

 	/*
@@ -81,7 +81,7 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
 		fl->fail_cnt++;
 	}

-	STRTCPY(fl->fail_line, tty);
+	strtcpy_a(fl->fail_line, tty);
 	fl->fail_time = time(NULL);

 	/*
@@ -92,7 +92,7 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
 	 */

 	if (   (lseek (fd, offset_uid, SEEK_SET) != offset_uid)
-	    || (write_full(fd, fl, sizeof *fl) == -1)) {
+	    || (write_full(fd, fl, sizeof(*fl)) == -1)) {
 		goto err_write;
 	}

@@ -150,7 +150,7 @@ int failcheck (uid_t uid, struct faillog *fl, bool failed)
 {
 	int fd;
 	struct faillog fail;
-	off_t offset_uid = (off_t) (sizeof *fl) * uid;
+	off_t offset_uid = (off_t) sizeof(*fl) * uid;

 	/*
 	 * Suppress the check if the log file isn't there.
@@ -182,7 +182,7 @@ int failcheck (uid_t uid, struct faillog *fl, bool failed)
 	 */

 	if (   (lseek (fd, offset_uid, SEEK_SET) != offset_uid)
-	    || (read (fd, fl, sizeof *fl) != (ssize_t) sizeof *fl)) {
+	    || (read(fd, fl, sizeof(*fl)) != (ssize_t) sizeof(*fl))) {
 		(void) close (fd);
 		return 1;
 	}
@@ -204,7 +204,7 @@ int failcheck (uid_t uid, struct faillog *fl, bool failed)
 		fail.fail_cnt = 0;

 		if (   (lseek (fd, offset_uid, SEEK_SET) != offset_uid)
-		    || (write_full(fd, &fail, sizeof fail) == -1)) {
+		    || (write_full(fd, &fail, sizeof(fail)) == -1)) {
 			    goto err_write;
 		}

@@ -252,7 +252,7 @@ void failprint (const struct faillog *fail)
 	/*
 	 * Print all information we have.
 	 */
-	STRFTIME(lasttimeb, "%c", tp);
+	strftime_a(lasttimeb, "%c", tp);

 	/*@-formatconst@*/
 	(void) printf (ngettext ("%d failure since last login.\n"
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -7,13 +7,14 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include "fields.h"

 #include <ctype.h>
-#include <string.h>
+#include <stddef.h>
 #include <stdio.h>
+#include <string.h>

 #include "prototypes.h"
 #include "string/ctype/strisascii/strisprint.h"
@@ -62,15 +63,14 @@ change_field(char *buf, size_t maxsize, const char *prompt)
 	char newf[200];
 	char *cp;

-	if (maxsize > sizeof (newf)) {
-		maxsize = sizeof (newf);
+	if (maxsize > sizeof(newf)) {
+		maxsize = sizeof(newf);
 	}

 	printf ("\t%s [%s]: ", prompt, buf);
 	(void) fflush (stdout);
-	if (fgets (newf, maxsize, stdin) != newf) {
+	if (fgets(newf, maxsize, stdin) == NULL)
 		return;
-	}

 	if (stpsep(newf, "\n") == NULL)
 		return;
--- a/lib/fields.h
+++ b/lib/fields.h
@@ -5,7 +5,7 @@
 #define _SHADOW_INCLUDE_LIB_FIELDS_H_


-#include <config.h>
+#include "config.h"

 #include <stddef.h>

--- a/lib/find_new_gid.c
+++ b/lib/find_new_gid.c
@@ -6,7 +6,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include <assert.h>
 #include <stdint.h>
@@ -18,16 +18,18 @@
 #include "groupio.h"
 #include "getdef.h"
 #include "shadowlog.h"
+#include "string/strerrno.h"
+

 /*
 * get_ranges - Get the minimum and maximum ID ranges for the search
 *
 * This function will return the minimum and maximum ranges for IDs
 *
- * 0: The function completed successfully
- * EINVAL: The provided ranges are impossible (such as maximum < minimum)
+ * 0: the function completed successfully
+ * EINVAL: the provided ranges are impossible (such as maximum < minimum)
 *
- * preferred_min: The special-case minimum value for a specifically-
+ * preferred_min: the special-case minimum value for a specifically-
 * requested ID, which may be lower than the standard min_id
 */
 static int get_ranges (bool sys_group, gid_t *min_id, gid_t *max_id,
@@ -54,11 +56,11 @@ static int get_ranges (bool sys_group, gid_t *min_id, gid_t *max_id,
 		/* Check that the ranges make sense */
 		if (*max_id < *min_id) {
 			(void) fprintf (log_get_logfd(),
-                            _("%s: Invalid configuration: SYS_GID_MIN (%lu), "
-                              "GID_MIN (%lu), SYS_GID_MAX (%lu)\n"),
-                            log_get_progname(), (unsigned long) *min_id,
-                            getdef_ulong ("GID_MIN", 1000UL),
-                            (unsigned long) *max_id);
+			    _("%s: Invalid configuration: SYS_GID_MIN (%lu), "
+			      "GID_MIN (%lu), SYS_GID_MAX (%lu)\n"),
+			    log_get_progname(), (unsigned long) *min_id,
+			    getdef_ulong ("GID_MIN", 1000UL),
+			    (unsigned long) *max_id);
 			return EINVAL;
 		}
 		/*
@@ -233,11 +235,11 @@ int find_new_gid (bool sys_group,
 	 */

 	/* Create an array to hold all of the discovered GIDs */
-	used_gids = CALLOC (gid_max + 1, bool);
+	used_gids = calloc_T(gid_max + 1, bool);
 	if (NULL == used_gids) {
 		fprintf (log_get_logfd(),
 			 _("%s: failed to allocate memory: %s\n"),
-			 log_get_progname(), strerror (errno));
+			 log_get_progname(), strerrno());
 		return -1;
 	}

@@ -245,7 +247,7 @@ int find_new_gid (bool sys_group,
 	(void) gr_rewind ();
 	highest_found = gid_min;
 	lowest_found = gid_max;
-	while ((grp = gr_next ()) != NULL) {
+	while (NULL != (grp = gr_next())) {
 		/*
 		 * Does this entry have a lower GID than the lowest we've found
 		 * so far?
--- a/lib/find_new_sub_gids.c
+++ b/lib/find_new_sub_gids.c
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ifdef ENABLE_SUBIDS

--- a/lib/find_new_sub_uids.c
+++ b/lib/find_new_sub_uids.c
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #ifdef ENABLE_SUBIDS

--- a/lib/find_new_uid.c
+++ b/lib/find_new_uid.c
@@ -6,7 +6,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <config.h>
+#include "config.h"

 #include <assert.h>
 #include <stdint.h>
@@ -18,16 +18,17 @@
 #include "pwio.h"
 #include "getdef.h"
 #include "shadowlog.h"
+#include "string/strerrno.h"

 /*
 * get_ranges - Get the minimum and maximum ID ranges for the search
 *
 * This function will return the minimum and maximum ranges for IDs
 *
- * 0: The function completed successfully
- * EINVAL: The provided ranges are impossible (such as maximum < minimum)
+ * 0: the function completed successfully
+ * EINVAL: the provided ranges are impossible (such as maximum < minimum)
 *
- * preferred_min: The special-case minimum value for a specifically-
+ * preferred_min: the special-case minimum value for a specifically-
 * requested ID, which may be lower than the standard min_id
 */
 static int get_ranges (bool sys_user, uid_t *min_id, uid_t *max_id,
@@ -54,11 +55,11 @@ static int get_ranges (bool sys_user, uid_t *min_id, uid_t *max_id,
 		/* Check that the ranges make sense */
 		if (*max_id < *min_id) {
 			(void) fprintf (log_get_logfd(),
-                            _("%s: Invalid configuration: SYS_UID_MIN (%lu), "
-                              "UID_MIN (%lu), SYS_UID_MAX (%lu)\n"),
-                            log_get_progname(), (unsigned long) *min_id,
-                            getdef_ulong ("UID_MIN", 1000UL),
-                            (unsigned long) *max_id);
+			    _("%s: Invalid configuration: SYS_UID_MIN (%lu), "
+			      "UID_MIN (%lu), SYS_UID_MAX (%lu)\n"),
+			    log_get_progname(), (unsigned long) *min_id,
+			    getdef_ulong ("UID_MIN", 1000UL),
+			    (unsigned long) *max_id);
 			return EINVAL;
 		}
 		/*
@@ -233,11 +234,11 @@ int find_new_uid(bool sys_user,
 	 */

 	/* Create an array to hold all of the discovered UIDs */
-	used_uids = CALLOC(uid_max + 1, bool);
+	used_uids = calloc_T(uid_max + 1, bool);
 	if (NULL == used_uids) {
 		fprintf (log_get_logfd(),
 			 _("%s: failed to allocate memory: %s\n"),
-			 log_get_progname(), strerror (errno));
+			 log_get_progname(), strerrno());
 		return -1;
 	}

@@ -245,7 +246,7 @@ int find_new_uid(bool sys_user,
 	(void) pw_rewind ();
 	highest_found = uid_min;
 	lowest_found = uid_max;
-	while ((pwd = pw_next ()) != NULL) {
+	while (NULL != (pwd = pw_next())) {
 		/*
 		 * Does this entry have a lower UID than the lowest we've found
 		 * so far?
--- a/lib/fputsx.c
+++ b/lib/fputsx.c
@@ -1,67 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1999, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "defines.h"
-#include "prototypes.h"
-#include "string/strcmp/streq.h"
-
-
-/*@null@*/char *
-fgetsx(/*@returned@*/char *restrict buf, int cnt, FILE *restrict f)
-{
-	char *cp = buf;
-	char *ep;
-
-	while (cnt > 0) {
-		if (fgets (cp, cnt, f) != cp) {
-			if (cp == buf) {
-				return NULL;
-			} else {
-				break;
-			}
-		}
-		ep = strrchr (cp, '\\');
-		if ((NULL != ep) && (*(ep + 1) == '\n')) {
-			cnt -= ep - cp;
-			if (cnt > 0)
-				cp = stpcpy(ep, "");
-		} else {
-			break;
-		}
-	}
-	return buf;
-}
-
-int fputsx (const char *s, FILE * stream)
-{
-	int i;
-
-	for (i = 0; !streq(s, ""); i++, s++) {
-		if (putc (*s, stream) == EOF) {
-			return EOF;
-		}
-
-#if 0				/* The standard getgr*() can't handle that.  --marekm */
-		if (i > (BUFSIZ / 2)) {
-			if (putc ('\\', stream) == EOF ||
-			    putc ('\n', stream) == EOF)
-				return EOF;
-
-			i = 0;
-		}
-#endif
-	}
-	return 0;
-}
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chris Hofstaedtler	c5f795a54a	New upstream version 4.19.2	2026-01-25 14:17:08 +01:00
Chris Hofstaedtler	428fe43d86	New upstream version 4.19.0	2026-01-06 00:37:15 +01:00