Tag release 4.1.2

2008-05-25 12:58:59 +00:00
10714 changed files with 78506 additions and 601812 deletions
--- a/.builds/alpine-edge.yml
+++ b/.builds/alpine-edge.yml
@@ -1,34 +0,0 @@
-image: alpine/latest
-# apk add --update alpine-sdk
-packages:
-  - cmd:setcap
-  - autoconf
-  - automake
-  - byacc
-  - expect
-  - gettext
-  - gettext-dev
-  - gettext-lang
-  - libbsd-dev
-  - libcap-dev
-  - libtool
-  - linux-pam-dev
-  - pkgconf
-  - sed
-sources:
-  - https://github.com/shadow-maint/shadow
-tasks:
-  - build: |
-      cd shadow
-      ./autogen.sh --without-selinux --disable-man --disable-nls
-      grep ENABLE_ config.status
-  - tasks: |
-      cd shadow
-      cat /proc/self/uid_map
-      cat /proc/self/status
-      make
-      make DESTDIR=/tmp/shadow-inst install
-      sudo make install
-      #TODO - fix up the tests.  Let's merge what's here now as it
-      #at least tests build.
-      #(cd tests; sudo ./run_some || { cat testsuite.log; false; })
--- a/.builds/fedora.yml
+++ b/.builds/fedora.yml
@@ -1,33 +0,0 @@
-image: fedora/latest
-packages:
-  - autoconf
-  - automake
-  - byacc
-  - expect
-  - findutils
-  - gettext
-  - gettext-devel
-  - git
-  - libbsd-devel
-  - libselinux-devel
-  - libsemanage-devel
-  - libtool
-  - libxslt
-  - pkgconf
-sources:
-  - https://github.com/shadow-maint/shadow
-tasks:
-  - build: |
-      cd shadow
-      ./autogen.sh --with-selinux --enable-man
-      grep ENABLE_ config.status
-  - tasks: |
-      cd shadow
-      cat /proc/self/uid_map
-      cat /proc/self/status
-      make
-      make DESTDIR=/tmp/shadow-inst install
-      sudo make install
-      #TODO - fix up the tests.  Let's merge what's here now as it
-      #at least tests build.
-      #(cd tests; sudo ./run_some || { cat testsuite.log; false; })
--- a/.builds/ubuntu-focal.yml
+++ b/.builds/ubuntu-focal.yml
@@ -1,28 +0,0 @@
-image: ubuntu/focal
-packages:
-  - automake
-  - autopoint
-  - xsltproc
-  - libbsd-dev
-  - libselinux1-dev
-  - gettext
-  - expect
-  - byacc
-  - libtool
-  - pkgconf
-sources:
-  - https://github.com/shadow-maint/shadow
-tasks:
-  - build: |
-      cd shadow
-      ./autogen.sh --without-selinux --disable-man
-      grep ENABLE_ config.status
-  - tasks: |
-      cd shadow
-      cat /proc/self/uid_map
-      cat /proc/self/status
-      systemd-detect-virt
-      make
-      make DESTDIR=/tmp/shadow-inst install
-      sudo make install
-      (cd tests; sudo ./run_some || { cat testsuite.log; false; })
--- a/.builds/ubuntu-jammy.yml
+++ b/.builds/ubuntu-jammy.yml
@@ -1,28 +0,0 @@
-image: ubuntu/22.04
-packages:
-  - automake
-  - autopoint
-  - xsltproc
-  - libbsd-dev
-  - libselinux1-dev
-  - gettext
-  - expect
-  - byacc
-  - libtool
-  - pkgconf
-sources:
-  - https://github.com/shadow-maint/shadow
-tasks:
-  - build: |
-      cd shadow
-      ./autogen.sh --without-selinux --enable-man
-      grep ENABLE_ config.status
-  - tasks: |
-      cat /proc/self/uid_map
-      cat /proc/self/status
-      systemd-detect-virt
-      cd shadow
-      make
-      make DESTDIR=/tmp/shadow-inst install
-      sudo make install
-      (cd tests; sudo ./run_some || { cat testsuite.log; false; })
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +0,0 @@
-root = true
-
-[*.{c,h}]
-indent_style = tab
--- a/.github/actions/install-dependencies/action.yml
+++ b/.github/actions/install-dependencies/action.yml
@@ -1,12 +0,0 @@
-name: 'Install dependencies'
-description: 'Install dependencies to build shadow-utils'
-runs:
-  using: "composite"
-  steps:
-  - shell: bash
-    run: |
-      sudo apt-get update -y
-      sudo apt-get install -y ubuntu-dev-tools libbsd-dev
-      sudo sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
-      sudo apt-get update -y
-      sudo apt-get -y build-dep shadow
--- a/.github/workflows/runner.yml
+++ b/.github/workflows/runner.yml
@@ -1,108 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: debug
-      run: |
-        id
-        which bash
-        whoami
-        env
-        ps -ef
-        pwd
-        cat /proc/self/uid_map
-        cat /proc/self/status
-        systemd-detect-virt
-    - name: Install dependencies
-      run: |
-        sudo cat /etc/apt/sources.list
-        sudo sed -i '/deb-src/d' /etc/apt/sources.list
-        sudo sed -i '/^deb /p;s/ /-src /' /etc/apt/sources.list
-        export DEBIAN_PRIORITY=critical
-        export DEBIAN_FRONTEND=noninteractive
-        # let's try to work around upgrade breakage in a pkg we don't care about
-        sudo apt-mark hold grub-efi-amd64-bin grub-efi-amd64-signed
-        sudo apt-get update
-        sudo apt-get -y dist-upgrade
-        sudo apt-get -y install ubuntu-dev-tools automake autopoint xsltproc gettext expect byacc libtool libbsd-dev pkgconf
-        sudo apt-get -y build-dep shadow
-    - name: configure
-      run: |
-        autoreconf -v -f --install
-        ./autogen.sh --without-selinux --disable-man --with-yescrypt
-    - run: make
-    - run: make install DESTDIR=${HOME}/rootfs
-    - run: sudo make install
-    - name: run tests in shell with tty
-      shell: 'script -q -e -c "bash {0}"'
-      run: |
-        set -e
-        cd tests
-        sudo ./run_some
-        cat testsuite.log
-
-  # Make sure that 'make dist' makes a usable tarball with no missing files
-  dist-build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Install dependencies
-      run: |
-        sudo cat /etc/apt/sources.list
-        sudo sed -i '/deb-src/d' /etc/apt/sources.list
-        sudo sed -i '/^deb /p;s/ /-src /' /etc/apt/sources.list
-        export DEBIAN_PRIORITY=critical
-        export DEBIAN_FRONTEND=noninteractive
-        # let's try to work around upgrade breakage in a pkg we don't care about
-        sudo apt-mark hold grub-efi-amd64-bin grub-efi-amd64-signed
-        sudo apt-get update
-        sudo apt-get -y dist-upgrade
-        sudo apt-get -y install ubuntu-dev-tools automake autopoint xsltproc gettext expect byacc libtool libbsd-dev pkgconf
-        sudo apt-get -y build-dep shadow
-
-    - name: Test make dist
-      run: |
-        ./autogen.sh
-        make dist
-        f=shadow-*.tar.gz
-        tar -zxf $f
-        d=$(basename $f .tar.gz)
-        cd $d
-        ./configure
-        make -j5
-
-  container-build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [alpine, debian, fedora]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Build container
-      run: |
-        docker buildx build -f ./share/containers/${{ matrix.os }}.dockerfile . --output build-out
-
-    - name: Store artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: ${{ matrix.os }}-build
-        path: |
-          ./build-out/config.log
-          ./build-out/config.h
-        if-no-files-found: ignore
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -1,61 +0,0 @@
-name: "Static code analysis"
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-  schedule:
-    # Everyday at midnight
-    - cron: '0 0 * * *'
-jobs:
-  codeql:
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Install dependencies
-      id: dependencies
-      uses: ./.github/actions/install-dependencies
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: cpp
-        queries: +security-and-quality
-
-    - name: Configure shadow-utils
-      run: ./autogen.sh --without-selinux --disable-man
-
-    - name: Build shadow-utils
-      run: |
-        PROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
-        make -kj$PROCESSORS || true
-
-    - name: Check build errors
-      run: make
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-
-  differential-shellcheck:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      security-events: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      # Doc: https://github.com/redhat-plumbers-in-action/differential-shellcheck#usage
-      - name: Differential ShellCheck
-        uses: redhat-plumbers-in-action/differential-shellcheck@v3
-        with:
-          severity: warning
-          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +0,0 @@
-*~
-lib*.a
-*.o
-*.lo
-*.la
-*.gmo
-.deps
-.libs
-
-*.patch
-*.rej
-*.orig
-
-Makefile
-Makefile.in
-
-/ABOUT-NLS
-/aclocal.m4
-/autom4te.cache
-/compile
-/config.cache
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.rpath
-/config.status
-/config.sub
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/m4
-/missing
-/stamp-h1
-/ylwrap
-
-/po/*.header
-/po/*.sed
-/po/*.sin
-/po/Makefile.in.in
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/stamp-po
-
-/shadow.spec
-/shadow-*.tar.*
-/libmisc/getdate.c
-/libsubid/subid.h
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,52 +0,0 @@
-dist: bionic
-sudo: false
-
-language: c
-
-compiler:
- - gcc
- - clang
-
-arch:
- - amd64
- - arm64
- - ppc64le
- - s390x
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get -y install -qq automake autopoint xsltproc libselinux1-dev gettext expect
-  - sudo apt-get -y install -qq byacc libtool
-script:
- - ./autogen.sh --without-selinux --disable-man
- - grep ENABLE_ config.status
- - make
-
-env:
-  global:
-   - secure: "G47VYFrtzqalrVjixTqBG9Qsa8EZRcaqsh1k6fq5JgEyHmMQActpvTUDs9FXf1MEqiY5XX3VDVfBsZgKPHgmHsMzD1bX11xpnpGByB8g7gr8I3u2ZkCREqgi77a5l3LeBh+seWiambe/DYOgvPCNa6pCynLgR9advqtgKhpCruU="
-
-addons:
-  coverity_scan:
-
-    project:
-      name: "shadow-maint/shadow"
-      description: "Upstream shadow utils tree"
-
-    notification_email: christian.brauner@ubuntu.com,serge@hallyn.com
-
-    build_command_prepend: "./autogen.sh --without-selinux --disable-man"
-    build_command: "make -kj4 || make"
-    branch_pattern: master
-
-script:
- - cat /proc/self/uid_map
- - cat /proc/self/status
- - systemd-detect-virt
- - ./autogen.sh --without-selinux --disable-man
- - grep ENABLE_ config.status
- - make
- - sudo make install
- - (cd tests; sudo ./run_some; cat testsuite.log)
-
-# vim:et:ts=2:sw=2
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,90 +0,0 @@
-Thanks to at least the following people for sending patches, bug
-reports and various comments. This list may be incomplete, I received
-a lot of mail...
-
-# Maintainers
-* Marek Michałkiewicz <marekm72@gmail.com> (1995-2000)
-* Tomasz Kłoczko <kloczek@pld.org.pl> (2000-2007)
-* Nicolas François <nicolas.francois@centraliens.net> (2007-2014)
-* Serge E. Hallyn <serge@hallyn.com> (2014-now)
-* Christian Brauner <christian@brauner.io> (2019-now)
-* Iker Pedrosa <ipedrosa@redhat.com> (2022-now)
-
-# Authors and contributors
-* Adam Rudnicki <adam@v-lo.krakow.pl>
-* Alan Curry <pacman@tardis.mars.net>
-* Aleksa Sarai <cyphar@cyphar.com>
-* Alexander O. Yuriev <alex@bach.cis.temple.edu>
-* Algis Rudys <arudys@rice.edu>
-* Andreas Jaeger <aj@arthur.rhein-neckar.de>
-* Andy Zaugg <andy.zaugg@gmail.com>
-* Aniello Del Sorbo <anidel@edu-gw.dia.unisa.it>
-* Anton Gluck <gluc@midway.uchicago.edu>
-* Arkadiusz Miskiewicz <misiek@pld.org.pl>
-* Ben Collins <bcollins@debian.org>
-* Brian R. Gaeke <brg@dgate.org>
-* Calle Karlsson <ckn@kash.se>
-* Chip Rosenthal <chip@unicom.com>
-* Chris Evans <lady0110@sable.ox.ac.uk>
-* Chris Lamb <chris@chris-lamb.co.uk>
-* Cristian Gafton <gafton@sorosis.ro>
-* Dan Walsh <dwalsh@redhat.com>
-* Darcy Boese <possum@chardonnay.niagara.com>
-* Dave Hagewood <admin@arrowweb.com>
-* David A. Holland <dholland@hcs.harvard.edu>
-* David Frey <David.Frey@lugs.ch>
-* Ed Carp <ecarp@netcom.com>
-* Ed Neville <ed@s5h.net>
-* Eric W. Biederman" <ebiederm@xmission.com>
-* Floody <flood@evcom.net>
-* Frank Denis <j@4u.net>
-* George Kraft IV <gk4@us.ibm.com>
-* Greg Mortensen <loki@world.std.com>
-* Guido van Rooij
-* Guy Maor <maor@debian.org>
-* Hrvoje Dogan <hdogan@bjesomar.srce.hr>
-* Jakub Hrozek <jhrozek@redhat.com>
-* Janos Farkas <chexum@bankinf.banki.hu>
-* Jason Franklin <jason.franklin@quoininc.com>
-* Jay Soffian <jay@lw.net>
-* Jesse Thilo <Jesse.Thilo@pobox.com>
-* Joey Hess <joey@kite.ml.org>
-* John Adelsberger <jja@umr.edu>
-* Jonathan Hankins <jhankins@mailserv.homewood.k12.al.us>
-* Jon Lewis <jlewis@lewis.org>
-* Joshua Cowan <jcowan@hermit.reslife.okstate.edu>
-* Judd Bourgeois <shagboy@bluesky.net>
-* Juergen Heinzl <unicorn@noris.net>
-* Juha Virtanen <jiivee@iki.fi>
-* Julian Pidancet <julian.pidancet@gmail.com>
-* Julianne Frances Haugh <julie78787@gmail.com>
-* Leonard N. Zubkoff <lnz@dandelion.com>
-* Luca Berra <bluca@www.polimi.it>
-* Lukáš Kuklínek <lkukline@redhat.com>
-* Lutz Schwalowsky <schwalow@mineralogie.uni-hamburg.de>
-* Marc Ewing <marc@redhat.com>
-* Martin Bene <mb@sime.com>
-* Martin Mares <mj@gts.cz>
-* Michael Meskes <meskes@topsystem.de>
-* Michael Talbot-Wilson <mike@calypso.bns.com.au>
-* Michael Vetter <jubalh@iodoru.org>
-* Mike Frysinger <vapier@gentoo.org>
-* Mike Pakovic <mpakovic@users.southeast.net>
-* Nicolas François <nicolas.francois@centraliens.net>
-* Nikos Mavroyanopoulos <nmav@i-net.paiko.gr>
-* Pavel Machek <pavel@bug.ucw.cz>
-* Peter Vrabec <pvrabec@redhat.com>
-* Phillip Street
-* Rafał Maszkowski <rzm@icm.edu.pl>
-* Rani Chouha <ranibey@smartec.com>
-* Sami Kerola <kerolasa@rocketmail.com>
-* Scott Garman <scott.a.garman@intel.com>
-* Sebastian Rick Rijkers <srrijkers@gmail.com>
-* Seraphim Mellos <mellos@ceid.upatras.gr>
-* Shane Watts <shane@nexus.mlckew.edu.au>
-* Steve M. Robbins <steve@nyongwa.montreal.qc.ca>
-* Thorsten Kukuk <kukuk@suse.de>
-* Tim Hockin <thockin@eagle.ais.net>
-* Timo Karjalainen <timok@iki.fi>
-* Ulisses Alonso Camaro <ulisses@pusa.eleinf.uv.es>
-* Werner Fink <werner@suse.de>
--- a/143
+++ b/143
@@ -1,41 +1,118 @@
-SPDX-License-Identifier: BSD-3-Clause
+NOTE:
+  This license has been obsoleted by the change to the BSD-style copyright.
+  You may continue to use this license if you wish, but you are under no
+  obligation to do so.

-All files under this project either
+(*
+This document is freely plagiarised from the 'Artistic Licence',
+distributed as part of the Perl v4.0 kit by Larry Wall, which is
+available from most major archive sites.  I stole it from CrackLib.

-1. fall under the BSD 3 clause license (by default).
+	$Id$
+*)

-2. carry an SPDX header declaring what license applies.
+This documents purpose is to state the conditions under which this
+Package (See definition below) viz: "Shadow", the Shadow Password Suite
+which is held by Julianne Frances Haugh, may be copied, such that the
+copyright holder maintains some semblance of artistic control over the
+development of the package, while giving the users of the package the
+right to use and distribute the Package in a more-or-less customary
+fashion, plus the right to make reasonable modifications. 

-or
+So there.

-3. list a full custom license
+***************************************************************************

-This software is originally
+Definitions:

- * Copyright (c) 1989 - 1994, Julianne Frances Haugh

- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the copyright holders or contributors may not be used to
- *    endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+A "Package" refers to the collection of files distributed by the
+Copyright Holder, and derivatives of that collection of files created
+through textual modification, or segments thereof. 
+
+"Standard Version" refers to such a Package if it has not been modified,
+or has been modified in accordance with the wishes of the Copyright
+Holder.
+
+"Copyright Holder" is whoever is named in the copyright or copyrights
+for the package.
+
+"You" is you, if you're thinking about copying or distributing this
+Package.
+
+"Reasonable copying fee" is whatever you can justify on the basis of
+media cost, duplication charges, time of people involved, and so on.
+(You will not be required to justify it to the Copyright Holder, but
+only to the computing community at large as a market that must bear the
+fee.)
+
+"Freely Available" means that no fee is charged for the item itself,
+though there may be fees involved in handling the item.  It also means
+that recipients of the item may redistribute it under the same
+conditions they received it.
+
+
+1.  You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated
+disclaimers.
+
+2.  You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder.  A Package
+modified in such a way shall still be considered the Standard Version.
+
+3.  You may otherwise modify your copy of this Package in any way,
+provided that you insert a prominent notice in each changed file stating
+how and when AND WHY you changed that file, and provided that you do at
+least ONE of the following:
+
+a) place your modifications in the Public Domain or otherwise make them
+Freely Available, such as by posting said modifications to Usenet or an
+equivalent medium, or placing the modifications on a major archive site
+such as uunet.uu.net, or by allowing the Copyright Holder to include
+your modifications in the Standard Version of the Package.
+
+b) use the modified Package only within your corporation or organization.
+
+c) rename any non-standard executables so the names do not conflict with
+standard executables, which must also be provided, and provide separate
+documentation for each non-standard executable that clearly documents
+how it differs from the Standard Version.
+
+d) make other distribution arrangements with the Copyright Holder.
+
+4.  You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+a) distribute a Standard Version of the executables and library files,
+together with instructions (in the manual page or equivalent) on where
+to get the Standard Version.
+
+b) accompany the distribution with the machine-readable source of the
+Package with your modifications.
+
+c) accompany any non-standard executables with their corresponding
+Standard Version executables, giving the non-standard executables
+non-standard names, and clearly documenting the differences in manual
+pages (or equivalent), together with instructions on where to get the
+Standard Version.
+
+d) make other distribution arrangements with the Copyright Holder.
+
+5.  You may charge a reasonable copying fee for any distribution of this
+Package.  You may charge any fee you choose for support of this Package. 
+YOU MAY NOT CHARGE A FEE FOR THIS PACKAGE ITSELF.  However, you may
+distribute this Package in aggregate with other (possibly commercial)
+programs as part of a larger (possibly commercial) software distribution
+provided that YOU DO NOT ADVERTISE this package as a product of your
+own. 
+
+6.  The name of the Copyright Holder may not be used to endorse or
+promote products derived from this software without specific prior
+written permission.
+
+7.  THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+				The End
--- a/7043
+++ b/7043
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,7 @@

 EXTRA_DIST = NEWS README TODO shadow.spec.in

-SUBDIRS = libmisc lib
+AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign

-if ENABLE_SUBIDS
-SUBDIRS += libsubid
-endif
-
-SUBDIRS += src po contrib doc etc
-
-if ENABLE_REGENERATE_MAN
-SUBDIRS += man
-endif
+SUBDIRS = po man libmisc lib src \
+	contrib doc etc
--- a/617
+++ b/617
@@ -1,450 +1,5 @@
 $Id$

-shadow-4.1.5.1 -> shadow-4.2					UNRELEASED
-
-*** general
-  * Handle libc whose crypt() returns NULL when passed a salt that
-    violates specs or system requirements (e.g. FIPS140). This is needed
-    with glibc/eglibc 2.17 for tools checking passwords (passwd (non PAM
-    enabled) or newgrp), and for tools generating encrypted passwords
-    (chgpasswd, chpasswd, or gpasswd when non PAM enabled or when a fixed
-    crypt method is requested on the command line, and newusers, or passwd
-    in their non PAM enabled versions)
-  * Fix segfault when reading groups split on multiple lines. This impacts
-    most user/group management tools when MAX_MEMBERS_PER_GROUP is set.
-
- su
-  * When su receives a signal (SIGTERM, or SIGINT/SIGQUIT in non
-    interactive mode), kill the child process group, rather than just the
-    immediate child.
-  * Fix segmentation faults for users without a proper home or shell in
-    their passwd entries.
-
- login
-  * Fix segmentation faults for users without a proper home or shell in
-    their passwd entries.
-
-*** documentation
-  * Fixed useradd man page (--home-dir option, instead of --home).
-
-*** translation
-  * Updated Russian translation.
-  * Updated German man pages translation.
-  * Fixed gshadow Japanese man page translation.
-
-shadow-4.1.5 -> shadow-4.1.5.1					2012-05-25
-
- login
-  * Log into utmp(x) when PAM is enabled, but do not log into wtmp.
-    This complete pam_lastlog which logs into wtmp and in into utmp(x).
- su
-  * non PAM enabled versions: do not fail if su is called without a
-    controlling terminal.
- userdel
-  * Fix segfault when userdel removes the user's group.
-
-*** documentation
-  * .so links now point to paths relative to the top-level manual hierarchy
-
-*** translation
-  * Updated French man pages translation.
-  * Updated German man pages translation.
-  * Updated Polish man pages translation. (logoutd.8)
-
-shadow-4.1.4.3 -> shadow-4.1.5					2012-02-12
-
-*** security
-  * su -c could be abused by the executed command to invoke commands with
-    the caller privileges. See below. (CVE-2005-4890)
-
-*** general
-  * report usage error to stderr, but report usage help to stdout (and return
-    zero) when explicitly requested (e.g. with --help).
-  * initial support for tcb (http://openwall.com/tcb/) for useradd,
-    userdel, usermod, chage, pwck, vipw.
-  * Added support for ACLs and Extended Attributes in useradd and usermod.
-    Support shall be enabled with the new --with-acl or --with-attr
-    configure options.
-  * Added diagnosis for lock failures.
-  * use libsemanage instead of the semanage tool.
-
- chage
-  * Add --root option.
- chfn
-  * Add --root option.
- chgpasswd
-  * When the gshadow file exists but there are no gshadow entries, an entry
-    is created if the password is changed and group requires a
-    shadow entry.
-  * Add --root option.
- chpasswd
-  * PAM enabled versions: restore the -e option to allow restoring
-    passwords without knowing those passwords. Restore together the -m
-    and -c options. (These options were removed in shadow-4.1.4 on PAM
-    enabled versions)
-  * When the shadow file exists but there are no shadow entries, an entry
-    is created if the password is changed and passwd requires a
-    shadow entry.
-  * Add --root option.
- chsh
-  * Add --root option.
- faillog
-  * The -l, -m, -r, -t options only act on the existing users, unless -a is
-    specified.
-  * Add --root option.
- gpasswd
-  * Add --root option.
- groupadd
-  * Add --root option.
- groupdel
-  * Add --root option.
- groupmems
-  * Fix parsing of gshadow entries.
-  * Add --root option.
- groupmod
-  * Fixed groupmod when configured with --enable-account-tools-setuid.
-  * When the gshadow file exists but there are no gshadow entries, an entry
-    is created if the password is changed and group requires a
-    shadow entry.
-  * Add --root option.
- grpck
-  * Add --root option.
-  * NIS entries were dropped by -s (sort).
- grpconv
-  * Add --root option.
- grpunconv
-  * Add --root option.
- lastlog
-  * Add --root option.
- login
-  * Fixed limits support (non PAM enabled versions only)
-  * Added support for infinite limits and group based limits (non PAM
-    enabled versions only)
-  * Fixed infinite loop when CONSOLE is configured with a colon-separated
-    list of TTYs.
-  * Fixed warning and support for CONSOLE_GROUPS for users member of more
-    than 16 groups.
-  * Do not log into utmp(x) or wtmp when PAM is enabled. This is done by
-    pam_lastlog.
- newgrp, sg
-  * Fix parsing of gshadow entries.
- newusers
-  * Add --root option.
- passwd
-  * Add --root option.
- pwpck
-  * NIS entries were dropped by -s (sort).
-  * Add --root option.
- pwconv
-  * Add --root option.
- pwunconv
-  * Add --root option.
- useradd
-  * If the skeleton directory contained hardlinked files, copies of the
-    hardlink were removed from the skeleton directory.
-  * Add --root option.
- userdel
-  * Check the existence of the user's mail spool before trying to remove
-    it. If it does not exist, a warning is issued, but no failure.
-  * Do not remove a group with the same name as the user (usergroup) if
-    this group isn't the user's primary group.
-  * Add --root option.
-  * Add --selinux-user option.
- usermod
-  * Accept options in any order (username not necessarily at the end)
-  * When the shadow file exists but there are no shadow entries, an entry
-    is created if the password is changed and passwd requires a
-    shadow entry, or if aging features are used (-e or -f).
-  * Add --root option.
- su
-  * Document the su exit values.
-  * When su receives a signal, wait for the child to terminate (after
-    sending a SIGTERM), and kill it only if it did not terminate by itself.
-    No delay will be enforced if the child cooperates.
-  * Default ENV_SUPATH is /sbin:/bin:/usr/sbin:/usr/bin
-  * Fixed infinite loop when CONSOLE is configured with a colon-separated
-    list of TTYs.
-  * Fixed warning and support for CONSOLE_GROUPS for users member of more
-    than 16 groups.
-  * Do not forward the controlling terminal to commands executed with -c.
-    This prevents tty hijacking which could lead to execution with the
-    caller's privileges.
-  * Close PAM sessions as root. This will be more friendly to PAM modules
-    like pam_mount or pam_systemd.
-  * Added support for PAM modules which change PAM_USER.
-
-*** translation
-  * Updated Brazilian Portuguese translation.
-  * Updated Catalan translation.
-  * Updated Czech translation.
-  * Updated Danish translation.
-  * New Danish man pages translation.
-  * Updated French translation.
-  * Updated French man pages translation.
-  * Updated German translation.
-  * Updated German man pages translation.
-  * Updated Greek translation.
-  * Updated Italian man pages translation.
-  * Updated Japanese translation.
-  * Updated Kazakh translation.
-  * Updated Norwegian Bokmål translation.
-  * Updated Portuguese translation.
-  * Updated Russian translation.
-  * Updated Simplified Chinese translation.
-  * Updated Simplified Chinese man pages translation.
-  * Updated Swedish translation.
-  * Updated Vietnamese translation.
-
-shadow-4.1.4.2 -> shadow-4.1.4.3						2011-02-15
-
-*** security
- CVE-2011-0721: An insufficient input sanitation in chfn can be exploited
-  to create users or groups in a NIS environment.
-
-shadow-4.1.4.1 -> shadow-4.1.4.2					2009-07-24
-
- general
-  * Improved support for large groups (impacts most user/group management
-    tools).
-
- addition of system users or groups
-  * Speed improvement. This should be noticeable in case of LDAP configured
-    systems. This should impact useradd, groupadd, and newusers
-  * Since system accounts are allocated from SYS_?ID_MIN to SYS_?ID_MAX in
-    reverse order, accounts are packed close to SYS_?ID_MAX if SYS_?ID_MIN
-    is already used but there are still dome gaps.
-
- login
-  * Add support for shells being a shell script without a shebang.
- su
-  * Preserve the DISPLAY and XAUTHORITY environment variables. This was
-    only the case in the non PAM enabled versions.
-  * Add support for shells being a shell script without a shebang.
-
-*** translation
-  * The Finnish translation of passwd(1) was outdated and is no more
-    distributed.
-
-shadow-4.1.4 -> shadow-4.1.4.1						2009-05-22
-
- login
-  * Fix failures with empty usernames on non PAM versions.
-  * Fix CONSOLE (securetty) support on non PAM versions.
- newgrp
-  * Return the exit status of the child.
- userdel
-  * On Linux, do not check if an user is logged in with utmp, but check if
-    the user is running some processes.
-  * If not on Linux, continue to search for an utmp record, but make sure
-    the process recorded in the utmp entry is still running.
-  * Report failures to remove the user's mailbox
-  * When USERGROUPS_ENAB is enabled, remove the user's group when the
-    user was the only member.
-  * Do not fail when -r is used and the home directory does not exist.
- usermod
-  * Check if the user is busy when the user's UID, name or home directory
-    is changed.
-
-shadow-4.1.3.1 -> shadow-4.1.4						2009-05-10
-
- packaging
-  * Enable --enable-account-tools-setuid by default for PAM builds.
-  * Add configure option --enable-utmpx, disabled by default to mimic
-    the previous behavior on Linux (where utmp and utmpx are identical).
-  * Fix build failure on non-PAM systems when --without-pam is not
-    specified.
-
- chpasswd
-  * Change the passwords using PAM. This permits to define the password
-    policy in a central place. The -c/--crypt-method, -e/--encrypted,
-    -m/--md5 and -s/--sha-rounds options are no more supported on PAM
-    enabled systems.
- grpck
-  * Warn if a group has an entry in group and gshadow, and the password
-    field in group is not 'x'.
- login
-  * Do not trust the current utmp entry's ut_line to set PAM_TTY. This could
-    lead to DOS attacks.
-  * (PAM) Even if the user was already authenticated (-f flag), ask the
-    user to update his authentication token if needed.
- lastlog
-  * Fix regression causing empty reports.
- newusers
-  * Change the passwords using PAM. This permits to define the password
-    policy in a central place. The -c/--crypt-method and -s/--sha-rounds
-    options are no more supported on PAM enabled systems.
- pwck
-  * Warn if an user has an entry in passwd and shadow, and the password
-    field in passwd is not 'x'.
-
-*** translation
- - Updated Czech translation
- - Updated French translation
- - Updated German translation
- - Updated Japanese translation
- - Updated Korean translation
- - Updated Portuguese translation
- - Updated Russian translation
-
-shadow-4.1.3 -> shadow-4.1.3.1						2009-04-15
-
-*** security:
- Due to bad parsing of octal permissions, the permissions on tty (login)
-  but also UMASK were set wrongly (and weirdly). Only shadow-4.1.3 was
-  affected.
-
-*** general
- login
-  * Fix regression when no user is specified on the command line.
- userdel
-  * Fixed SE Linux support
- vipw
-  * SE Linux: Set the default context to the context of the file being
-    edited. This ensures that the backup file inherit from the file's
-    context.
-
-*** translation
- - Updated Norwegian Bokmål translation
-
-shadow-4.1.2.2 -> shadow-4.1.3						2009-04-12
-
-*** general:
- packaging
-  * Fixed support for OpenPAM.
-  * Fixed support for uclibc.
-  * Added configure --enable-account-tools-setuid (default) /
-    --disable-account-tools-setuid options. This permits to disable the
-    PAM authentication of the caller for chage, chgpasswd, chpasswd,
-    groupadd, groupdel, groupmod, newusers, useradd, userdel, and usermod.
-    This authentication is not necessary when these tools are not
-    installed setuid root.
-  * Added configure --with-group-name-max-length (default) /
-    --without-group-name-max-length options. This permits to configure the maximum length allowed for group names:
-      <no option> -> default of 16 (like today)
-      --with-group-name-max-length -> default of 16
-      --without-group-name-max-length -> no max length
-      --with-group-name-max-length=n > max is set to n
-    No sanity checking is performed on n so people could do
-    something neat like --with-group-name-max-length=MAX_INT
- addition of users or groups
-  * Speed improvement in case UID_MAX/SYS_UID_MAX/GID_MAX/SYS_GID_MAX is
-    used for an user/group. This should be noticeable in case of LDAP
-    configured systems. This should impact useradd, groupadd, and newusers
- error handling improvement
-  * Make sure errors and incomplete changes are reported to syslog and
-    audit in case of unexpected failures.
-  * Report system inconsistencies to syslog and audit.
-  * Only report success to syslog and audit if the changes are really
-    performed in the system databases.
-    This is still not complete.
- /etc/login.defs
-  * New CREATE_HOME variable to tell useradd to create a home directory by
-    default.
- Translations
-  * New Kazakh translation.
-  * Spanish manpages are no more distributed. They are outdated. Please
-    contact pkg-shadow-devel@lists.alioth.debian.org if you wish to
-    provide updates.
-
- faillog
-  * Accept users specified as a numerical UID, or ranges of users (-user,
-    user-, user1-user2).
-  * -l, -m, and -r now apply not only to existing users, but to all the
-    specified UIDs.
-  * Options can be specified in any order.
- gpasswd
-  * Added support for long options --add (-a), --delete (-d),
-    --remove-password (-r), --restrict (-R), --administrators (-A), and
-    --members (-M).
-  * Added support for usernames with arbitrary length.
-  * audit logging improvements.
-  * error handling improvement (see above).
-  * Log permission denied to syslog and audit.
- groupadd
-  * audit logging improvements.
-  * error handling improvement (see above).
-  * Speedup (see "addition of users or groups" above).
-  * do not create groups with GID set to (gid_t)-1.
-  * Allocate system group GIDs in reverse order. This could be useful
-    later to increase the static IDs range.
- groupdel
-  * audit logging improvements.
-  * error handling improvement (see above).
- groupmems
-  * Check if user exist before they are added to groups.
-  * Avoid segfault in case the specified group does not exist in /etc/group.
-  * Everybody is allowed to list the users of a group.
-  * /etc/group is open readonly when one just wants to list the users of a
-    group.
-  * Added syslog support.
-  * Use the groupmems PAM service name instead of groupmod.
-  * Fix segmentation faults when adding or removing users from a group.
-  * Added support for shadow groups.
-  * Added support long options --add (-a), --delete (-d), --purge (-p),
-    --list (-l), --group (-g).
- groupmod
-  * audit logging improvements.
-  * error handling improvement (see above).
-  * do not create groups with GID set to (gid_t)-1.
- grpck
-  * warn for groups with GID set to (gid_t)-1.
- login
-  * Restore the echoctl, echoke, onclr flags to the terminal termio flags.
-    Reset echoprt, noflsh, tostop. This behavior seems to have change by
-    mistake in earlier releases (4.0.8, for no obvious reason).
- newusers
-  * Implement the -r, --system option.
-  * Speedup (see "addition of users or groups" above).
-  * do not create users with UID set to (gid_t)-1.
-  * do not create groups with GID set to (gid_t)-1.
-  * Allocate system account UIDs/GIDs in reverse order. This could be useful
-    later to increase the static IDs range.
- passwd
-  * For compatibility with other passwd version, the --lock an --unlock
-    options do not lock or unlock the user account anymore.  They only
-    lock or unlock the user's password.
- pwck
-  * warn for users with UID set to (uid_t)-1.
- su
-  * Preserve COLORTERM in addition to TERM when su is called with the -l
-    option.
- useradd
-  * audit logging improvements.
-  * Speedup (see "addition of users or groups" above).
-  * See CREATE_HOME above.
-  * New -M/--no-create-home option to disable CREATE_HOME.
-  * do not create users with UID set to (gid_t)-1.
-  * Added -Z option to map SELinux user for user's login.
-  * Allocate system user UIDs in reverse order. This could be useful
-    later to increase the static IDs range.
- userdel
-  * audit logging improvements.
-  * Do not fail if the removed user is not in the shadow database.
-  * When the user's group shall be removed, do not fail if this group is
-    not in the gshadow file.
-  * Delete the SELinux user mapping for user's login.
- usermod
-  * Allow adding LDAP users (or any user not present in the local passwd
-    file) to local groups
-  * do not create users with UID set to (gid_t)-1.
-  * Added -Z option to map SELinux user for user's login.
-
-shadow-4.1.2.1 -> shadow-4.1.2.2					23-11-2008
-
-*** security
- Fix a race condition in login that could lead to gaining ownership or
-  changing mode of arbitrary files.
- Fix a possible login DOS, which could be caused by injecting forged
-  entries in utmp.
-
-shadow-4.1.2 -> shadow-4.1.2.1						26-06-2008
-
-*** security
- Fix an "audit log injection" vulnerability in login.
-  This vulnerability makes it easier for attackers to hide activities by
-  modifying portions of log events, e.g. by appending an addr= statement
-  to the login name.
-
 shadow-4.1.1 -> shadow-4.1.2						25-05-2008

 *** security:
@@ -511,7 +66,7 @@ shadow-4.1.0 -> shadow-4.1.1						02-04-2008
    faillog faster.
 - gpasswd
  * Fix failures when the gshadow file is not present.
-  * When a password is moved to the gshadow file, use "x" instead of "!"
+  * When a password is moved to the gshadow file, use "x" instead of "x"
    to indicate that the password is shadowed (consistency with grpconv).
  * Make sure the group and gshadow files are unlocked on exit.
 - groupadd
@@ -622,7 +177,7 @@ shadow-4.0.18.2 -> shadow-4.1.0						09-12-2007
 - Add support for uClibc with no l64a().
 - userdel, usermod: Fix infinite loop caused by erroneous group file
  containing two entries with the same name. (The fix strategy differs
-  from
+  from 
  (https://bugzilla.redhat.com/show_bug.cgi?id=240915)
 - userdel: Abort if an error is detected while updating the passwd or group
  databases. The passwd or group files will not be written.
@@ -654,9 +209,9 @@ shadow-4.0.18.2 -> shadow-4.1.0						09-12-2007
 - Use MD5_CRYPT_ENAB, ENCRYPT_METHOD, SHA_CRYPT_MIN_ROUNDS, and
  SHA_CRYPT_MAX_ROUNDS to define the default encryption algorithm for the
  passwords.
- chpasswd, chgpasswd, newusers: New options -c/--crypt-method and
+- chpaswd, chgpasswd, newusers: New options -c/--crypt-method and
  -s/--sha-rounds to supersede the system default encryption algorithm.
- chpasswd, chgpasswd, newusers: DES is no more the default algorithm. They
+- chpaswd, chgpasswd, newusers: DES is no more the default algorithm. They
  will respect the system default configured in /etc/login.defs

 *** documentation:
@@ -696,19 +251,19 @@ shadow-4.0.18 -> shadow-4.0.18.1					03-08-2006
 shadow-4.0.17 -> shadow-4.0.18						01-08-2006

 *** general:
- su: fixed set environment too early when using PAM, so move it to !USE_PAM
+- su: fixed set enviroment too early when using PAM, so move it to !USE_PAM
  (patch submitted by Mike Frysinger <vapier@gentoo.org>),
 - groupadd, groupmod, useradd, usermod: fixed UID/GID overflow (fixed
  http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=198920)
 - passwd, useradd, usermod: fixed inactive/mindays/warndays/maxdays overflow
-  (similar to RH#198920),
- groupmems: rewritten for use PAM and getopt_long() and now it is enabled
+  (simillar to RH#198920),
+- groupmems: rewrited for use PAM and getopt_long() and now it is enabled
  for build and install (patch by George Kraft <gk4@swbell.net>),
 - S/Key: removed assign getpass() to libshadow_getpass() on autoconf level
  (patch by Ulrich Mueller <ulm@kph.uni-mainz.de>; http://bugs.gentoo.org/139966),
 - usermod: back to previous -a option semantics and clarify -a behavior
  on documentation level (by Greg Schafer <gschafer@zip.com.au>),
- chsh, groupmod: rewritten for use getopt_long().
+- chsh, groupmod: rewrited for use getopt_long().
 - updated translations: ca, cs, da, eu, fr, gl, hu, ko, pl, pt, ru, sv, tr, uk, vi.
 *** documentation:
 - fr and ru man pages are up to date,
@@ -743,7 +298,7 @@ shadow-4.0.15 -> shadow-4.0.16						05-06-2006

 *** general:
 - userdel: better fix for old CERT VU#312962 (which was fixed in shadow 4.0.8):
-  fixed forgotten checking of the return value from fchown() before
+  fixed forgoten checking of the return value from fchown() before
  proceeding with the fchmod() (based on Owl patch prepared by
  Rafal Wojtczuk <nergal@owl.openwall.com>),
 - userdel: use login.defs::MAIL_DIR instead hardcoded /var/mail in created
@@ -755,7 +310,7 @@ shadow-4.0.15 -> shadow-4.0.16						05-06-2006
  passwords and libshadow_getpass() is used only because libc getpass()
  do not handles password prompting with echo enabled,
 - move login.defs::MD5_CRYPT_ENAB to non-PAM part,
- userdel: rewritten for use getopt_log(),
+- userdel: rewrited for use getopt_log(),
 - install default/template configuration files:
 -- if shadow is configured with use PAM install /etc/pam.d/* files,
 -- if shadow do not uses PAM install /etc/{limits,login.acces} files,
@@ -793,7 +348,7 @@ shadow-4.0.15 -> shadow-4.0.16						05-06-2006
 - updated ru login.defs(5), passwd(1), userdel(8), usermod(8) man pages,
 - pw_auth(3) man page removed (outdated),
 - install limits(5), login.access(5) and porttime(5) man pages only when
-  shadow is built with PAM support disabled,
+  shadow is builded with PAM support disabled,
 - passwd(1): better document how password strength is checked
  (fixed http://bugs.debian.org/115380),
 - usermod(8): added missing -a option description
@@ -816,7 +371,7 @@ shadow-4.0.14 -> shadow-4.0.15						13-03-2006
 - login: default UMASK if not specified in login.defs is 022 (pointed by
  Peter Vrabec <pvrabec@redhat.com>),
 - chgpasswd: new tool (by Jonas Meurer <mejo@debian.org>),
- lastlog: print the usage and exit if an additional argument is provided to
+- lastlog: print the usage and exit if an additional argument is profided to
  lastlog (merge 488_laslog_verify_arguments Debian patch),
 - login, newgrp, nologin, su: do not link with libselinux (merge
  490_link_selinux_only_when_needed Debian patch),
@@ -830,9 +385,9 @@ shadow-4.0.14 -> shadow-4.0.15						13-03-2006
    tries exceeded,
  - always prints the number of tries in the syslog entry.
  - add special handling for PAM_ABORT
-  - add an entry to faillog, as when USE_PAM is not defined. (#53164)
+  - add an entry to failog, as when USE_PAM is not defined. (#53164)
  - changed pam_end to PAM_END. This is certainly was a mistake.  PAM_END is
-    pam_close_session + pam_end. Here, the session is still not open, we
+    pam_close_seesion + pam_end. Here, the session is still not open, we
    don't have to close it.
  - a HAVE_PAM_FAIL_DELAY is missing,
 - su: fixed pam session support (patch from Topi Miettinen; fixed #57526,
@@ -840,7 +395,7 @@ shadow-4.0.14 -> shadow-4.0.15						13-03-2006
 - userdel: user's group is already removed by update_groups().
  remove_group() is not needed (bug introduced in 4.0.14 on merge FC fixes).
  Fixed by Nicolas François <nicolas.francois@centraliens.net>,
- useradd: always remove group and gshadow databases lock, Fixed by Nicolas
+- useradd: allways remove group and gshadow databases lock, Fixed by Nicolas
  François <nicolas.francois@centraliens.net>
  (http://bugs.debian.org/348250)
 - auditing fixes:
@@ -848,14 +403,14 @@ shadow-4.0.14 -> shadow-4.0.15						13-03-2006
    added audit_logger() prototype),
  - useradd: fixed excess audit_logger() argument,
 - chage: added missing \n on display password status if password must be
-  changed,
+  chaged,
 - useradd: fixed allow non-unique UID (http://bugs.debian.org/351281),
- various code cleanups for make possible compilation of shadow with -Wall
+- variouse code cleanups for make possible compilation of shadow with -Wall
  -Werror (by Alexander Gattin <xrgtn@yandex.ru>),
 - su: move exit() outside libmisc/shell.c::shell() for handle shell() errors
  on higher level (now is better visable where some programs exit with 126
  and 127 exit codes); added new shell() parameter (char *const envp[])
-  which allow fix preserving environment in su on using -p, (patch by
+  which allow fix preserving enviloment in su on using -p, (patch by
  Alexander Gattin <xrgtn@yandex.ru>),
 - su: added handle -c,--command option for GNU su compliance (merge
  437_su_-c_option Debian patch),
@@ -903,7 +458,7 @@ shadow-4.0.13 -> shadow-4.0.14						03-01-2006
 - userdel: make the -f option force the removal of the user's group (even if it
  is the primary group of another user)
  (merge 453_userdel_-f_removes_group Debian patch),
- usermod: rewritten for use getopt_long() (Christian Perrier <bubulle@kheops.frmug.org>),
+- usermod: rewrited for use getopt_long() (Christian Perrier <bubulle@kheops.frmug.org>),
 - grpck: fixed segmentation fault on using -s when /etc/gshadow is empty (fix by
  Tomasz Lemiech <szpajder@staszic.waw.pl>),
 - passwd: remove handle -f, -g and -s options.
@@ -912,7 +467,7 @@ shadow-4.0.13 -> shadow-4.0.14						03-01-2006
  Nicolas François <nicolas.francois@centraliens.net>)
 - su: export $USER and $SHELL as well as $HOME (http://bugs.debian.org/11003 and
  http://bugs.debian.org/11189),
- su, vipw: rewritten for use getopt_long(),
+- su, vipw: rewrited for use getopt_long(),
 - su: log successful/failed through syslog (http://bugs.debian.org/190215),
 - updated translations: ca, cs, da, eu, fi, fr, it, pl, pt, ru, sv, tl, vi,
 - new translations: gl.
@@ -946,7 +501,7 @@ shadow-4.0.12 -> shadow-4.0.13						10-10-2005

 *** general:
 - chage: removed duplicated pam_start(),
- chfn, chsh: finished PAM support using pam_start() and co.,
+- chfn, chsh: finished PAM support usin pam_start() and co.,
 - userdel: userdel should not remove the group which is primary for someone else
  (fix by Nicolas François <nicolas.francois@centraliens.net>
  http://bugs.debian.org/295416),
@@ -955,7 +510,7 @@ shadow-4.0.12 -> shadow-4.0.13						10-10-2005
 - fixedlib/commonio.c: don't assume selinux is enabled if is_selinux_enabled()
  returns -1 (merge isSelinuxEnabled FC patch by Jeremy Katz <katzj@redhat.com>),
 - login, su (non-PAM case): fixed setup max address space limits (added missing break
-  statement in case) spotted by Lasse Collin <lasse.collin@tukaani.org>,
+  statement in case) spoted by Lasse Collin <lasse.collin@tukaani.org>,
 - auditing support added. Patch prepared by Peter Vrabec <pvrabec@redhat.com> basing
  on work by Steve Grubb from http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=159215
  Now auditing support have commands: chage, gpasswd, groupadd, groupdel, groupmod,
@@ -966,18 +521,18 @@ shadow-4.0.12 -> shadow-4.0.13						10-10-2005
  to example described in ident(1) man page (modern compilers like latest GCC
  removes not used functions by global optimization).
  So "ident /usr/bin/passwd" will show again some useable informations
- su: fixed twice copy environment which causes auth problems
+- su: fixed twice copy enviroment which causes auth problems
  (bug was introduced in 4.0.12; fix by Nicolas François <nicolas.francois@centraliens.net>),
 - chage: differentiate the different failure causes by the exit value
  This will permit to adduser Debian script to detect if chage failed because the
  system doesn't have shadowed passwords (fix for http://bugs.debian.org/317012),
 - merge 010_more-i18ned-messages Debian patch which adds i18n support for few
-  more messages (originally patch was prepared by Guillem Jover <guillem@debian.org>),
+  more messages (orginaly patch was prepared by Guillem Jover <guillem@debian.org>),
 - lastlog: added handle -b option which allow print only lastlog records older than
  specified DAYS (fix by <miles@lubin.us>),
 - chpasswd, gpasswd, newusers: fixed libmisc/salt.c for use login.defs::MD5_CRYPT_ENAB
  only if PAM support is disabled (fix by John Gatewood Ham <zappaman@buraphalinux.org>),
- passwd: rewritten for use getopt_long(),
+- passwd: rewrited for use getopt_long(),
 - newgrp: when newgrp process sits between parent and child shells, it should
  propagate STOPs from child to parent and CONTs from parent to child,
  otherwise e.g. bash's "suspend" command won't work
@@ -987,11 +542,11 @@ shadow-4.0.12 -> shadow-4.0.13						10-10-2005
 - chsh(1), groupadd(8), newusers(8), pwconv(8), useradd(8), userdel(8), usermod(8):
  added missing references to /etc/login.defs and login.defs(5)
  (Christian Perrier <bubulle@kheops.frmug.org>),
- passwd(5): rewritten based on work by Greg Wooledge <greg@wooledge.org>
+- passwd(5): rewrited based on work by Greg Wooledge <greg@wooledge.org>
  http://bugs.debian.org/328113
 - login(1): added securetty(5) to SEE ALSO section
  (fixed Debian bug http://bugs.debian.org/325773),
- groupadd(8), useradd(8): fix regular expression describing allowed login/group
+- groupadd(8), useradd(8): fix regular expression describing alloved login/group
  names (pointed by Nicolas François <nicolas.francois@centraliens.net>)
  (correct is [a-z_][a-z0-9_-]*[$]),
 - groupadd(8), useradd(8): documents in CAVEATS section the limitations shadow
@@ -1001,9 +556,9 @@ shadow-4.0.12 -> shadow-4.0.13						10-10-2005
 shadow-4.0.11.1 -> shadow-4.0.12					22-08-2005

 *** general:
- newgrp, login: remove using login.defs::CLOSE_SESSIONS variable and always
+- newgrp, login: remove using login.defs::CLOSE_SESSIONS variable and allways 
  close PAM session,
- fixed configure.in: really enable shadow group support by default (pointed by
+- fixed configure.in: realy enable shadow group support by default (pointed by 
  Greg Schafer <gschafer@zip.com.au> and Peter Vrabec <pvrabec@redhat.com>),
 - login.defs: removed handle QMAIL_DIR variable,
 - login: allow regular user to login on read-only root file system (not only for root)
@@ -1028,9 +583,9 @@ shadow-4.0.11.1 -> shadow-4.0.12					22-08-2005
  period and permit brute-force attacks (fixed http://bugs.debian.org/288827),
 - uClibc fixes (by Martin Schlemmer <azarah@nosferatu.za.org>):
  added require ngettext (added [need-ngettext] to AM_GNU_GETTEXT() parameters)
-  and stub prototype for ngettext() in lib/prototypes.h (necessary if shadow
+  and stub prototype for ngettext() in lib/prototypes.h (neccessary if shadow
  compiled with disabled NLS support)
- groupadd: rewritten for use getopt_long(),
+- groupadd: rewrited for use getopt_long(),
 - groupadd, groupdel, groupmod, userdel: do OPENLOG() before pam_start(),
 - groupadd: fixed double OPENLOG(),
 - removed lib/{grpack,gspack,pwpack,sppack}.c and prototypes from lib/prototypes.h
@@ -1066,7 +621,7 @@ shadow-4.0.10 -> shadow-4.0.11						18-07-2005
 - su: ignore SIGINT while authenticating. A ^C could defeat the waiting period and
  permit brute-force attacks. Also ignore SIGQUIT.
  Fixed: http://bugs.debian.org/52372 and http://bugs.debian.org/288827
- useradd: rewritten for use getopt_long(),
+- useradd: rewrited for use getopt_long(),
 - newgrp: add fix for handle splitted NIS groups: extends the functionality that,
  if the requested group is given, all groups of the same GID are tested for
  membership of the requesting user.
@@ -1080,7 +635,7 @@ shadow-4.0.10 -> shadow-4.0.11						18-07-2005
 - S/Key support is back,
 - usermod: added -a option. This flag can only be used in conjunction with the -G
  option. It cause usermod to append user to the current supplementary group list.
-  (patch by Peter Vrabec <pvrabec@redhat.com>)
+  (patch by Peter Vrabec <pvrabec@redhat.com>) 
 - chage: added missing \n in error messages,
 - useradd, groupadd: change -O option to -K and document it in man page,
 - su, sulogin, login: fixed erroneous warning messages when used with PAM about some
@@ -1097,7 +652,7 @@ shadow-4.0.10 -> shadow-4.0.11						18-07-2005
 - updated translations: cs, da, de, es, fi, pl, pt, ro, ru, sk.
 *** documentation:
 - pwck(8): document -q option (based on Debian patch for fix http://bugs.debian.org/309408)
- pwck(8): rewritten OPTIONS section and better SYNOPSIS,
+- pwck(8): rewrited OPTIONS section and better SYNOPSIS,
 - lastlog(8): document that lastlog is a sparse file, and don't need to be rotated
  http://bugs.debian.org/219321
 - login(8): better explain the respective roles of login, init and getty with regards
@@ -1111,12 +666,12 @@ shadow-4.0.9 -> shadow-4.0.10						28-06-2005

 *** general:
 - mkpasswd: removed,
- userdel: now deletes user groups from /etc/gshadow as well as /etc/group.
+- userdel: now deletes user groups from /etc/gshdow as well as /etc/group.
  Fix by Nicolas François <nicolas.francois@centraliens.net>.
  http://bugs.debian.org/99442
 - usermod: when relocating a user's home directory, don't fail and remove the new
  home directory if we can't remove the old home directory for some
-  reason; the results can be spectacularly poor if, for instance, only
+  reason; the results can be spectularly poort if, for instance, only
  the rmdir() fails. Patch prepared by Timo Lindfors <lindi-spamtrap@newmail.com>.
  http://bugs.debian.org/166369
 - su: fix syslogs to be less ambiguous. Use old:new format instead of old-new
@@ -1124,23 +679,23 @@ shadow-4.0.9 -> shadow-4.0.10						28-06-2005
  http://bugs.debian.org/213592
 - removed not used now libmisc/setup.c,
 - login: use also UTMPX API instead UTMP on failure (login was affected for this
-  when shadow was built without PAM support)
+  when shadow was builded without PAM support)
  patch by Nicolas François <nicolas.francois@centraliens.net>
 - login: the PAM session needs to be closed as root, thus before change_uid()
  http://bugs.debian.org/53570 http://bugs.debian.org/195048 http://bugs.debian.org/211884
 - login: made login's -f option also able to use the username after -- if none
  was passed as it's optarg
-  http://bugs.debian.org/53702
+  http://bugs.debian.org/53702 
 - login: check for hushed login and pass PAM_SILENT if true,
  http://bugs.debian.org/48002
- login: fixed username on successful login (was using the normal username,
+- login: fixed username on succesful login (was using the normal username,
  when it should have used pam_user) http://bugs.debian.org/47819
- remove using SHADOWPWD #define so now shadow is always built with shadow
-  password support,
- chage: rewritten for use getopt_long(),
+- remove using SHADOWPWD #define so now shadow is allways builded with shadow
+  passwowd support,
+- chage: rewrited for use getopt_long(),
 - updated translations: ca, cs, da, fi, pl, ru, zh_TW.
 *** documentation:
- most of the man pages now are generated from XML files so in case submitting any
+- most of the man pages now are generated from XML files so in case submiting any
  chages to this resources please make diff to XML files,
 - chfn: give more details about the influence of login.defs on what's allowed to
  users.
@@ -1148,7 +703,7 @@ shadow-4.0.9 -> shadow-4.0.10						28-06-2005
 shadow-4.0.8 -> shadow-4.0.9						23-05-2005

 *** general:
- passwd: fixed segfault in non-PAM configuration
+- passwd: fixed segfault in non-PAM connfiguration
  (submited by Greg Schafer <gschafer@zip.com.au>),
 - newgrp: fixed NULL pointer dereference - getlogin() and ttyname() can
  return NULL which is not checked (http://bugs.debian.org/162303),
@@ -1170,15 +725,15 @@ shadow-4.0.7 -> shadow-4.0.8						26-04-2005
 - configure.in: add using AC_GNU_SOURCE macro for kill compilation warnings about
  implicit declaration of function `fseeko',
 - faillog: changed faillog record display format for allow fit in 80 columns all
-  faillog attributes,
+  faillog atributies,
 - removed NDBM code (unused),
- fixed use of SU_WHEEL_ONLY in su. Now su really is available for wheel group
+- fixed use of SU_WHEEL_ONLY in su. Now su realy is avalaible for wheel group
  members. Thanks to Mike Frysinger <vapier@gentoo.org> for report:
  http://bugs.gentoo.org/show_bug.cgi?id=80345
 - drop never finished kerberos and des_rpc support (for kerberos support back firs
  must be prepared modularization),
 - fixed UTMP path detection (by Kelledin <kelledin@users.sf.net>),
- useradd: rewritten group count to dynamic (by John Newbigin
+- useradd: rewrited group count to dynamic (by John Newbigin
  <jnewbigin@ict.swin.edu.au>),
 - login: fixed create lastlog entry fo users never loged in on non-PAM
  variant of login (fix by <oracular@ziplip.com>),
@@ -1193,7 +748,7 @@ shadow-4.0.7 -> shadow-4.0.8						26-04-2005
  fchmod() is executed. (Actually, we could also pass the final "mode" to
  the open() call and then save the consequent fchmod().)
 - SELinux changes: added changes in chage, chfn, chsh, passwd for allow
-  construct more grained user password/account properties on SELinux
+  construct more grained user password/accuunt properties on SELinux
  policies level. Patch originally based on RH changes (submited by Chris
  PeBenito <pebenito@gentoo.org>),
 - added SELinux changes: in libmisc/copydir.c (based on Fedora patch),
@@ -1208,11 +763,11 @@ shadow-4.0.7 -> shadow-4.0.8						26-04-2005
 -- new: chage.1, chpasswd.8, expiry.1, faillog.5, faillog.8, getspnam.3,
   logoutd.8, porttime.5, pwck.8, shadow.3, shadowconfig.8, su.1,
 - passwd(1): fix #160477 Debian bug: improve -S output description,
- newgrp(1): fix #251926, #166173, #113191 Debian bugs: explain why editing /etc/group
+- newgrp(1): fix #251926, #166173, #113191 Debian bugs: explain why editing /etc/group   
  (without gshadow) doesn't permit to use newgrp,
 - newgrp(1): newgrp uses /bin/sh (not bash),
- faillog(8): updated after rewritten faillog command for use getopt_long(),
- login(1): removed fragment about abilities pass environment variables in login prompt,
+- faillog(8): updated after rewrited faillog command for use getopt_long(),
+- login(1): removed fragment about abilities pass enviroment variables in login prompt,
 - gshadow(5): new file (by Nicolas Nicolas François <nicolas.francois@centraliens.net>),
 - usermod(8): fixed #302388 Debian bug: added separated -o option description,

@@ -1229,24 +784,24 @@ shadow-4.0.6 -> shadow-4.0.7						26-01-2005
 -- use fseeko() instead fseek() and remove casting file offsets to unsigned
   long.
 - lastlog:
-- rewritten source code using the same style as in chpasswd.c,
-- open lastlog file after finish parse commandline options
-   (now --help output can be displayed for users without lastlog
+-- rewrited source code using the same style as in chpasswd.c,
+-- open lastlog file after finish parse comman line optiomns
+   (now --help otput can be displayd for users without lastlog
   file read permission),
 -- cleanups in lastlog(8) man page using the same style as in
   chpasswd(8).
 - chpasswd:
 -- switch chpasswd to use getopt_long() and adds a --md5 option
   (by Ian Gulliver <ian@penguinhosting.net>),
-- rewritten chpasswd(8) man page.
+-- rewrited chpasswd(8) man page.  

 shadow-4.0.5 -> shadow-4.0.6						08-11-2004

- su: fixed adding of pam_env env variables to environment
+- su: fixed adding of pam_env env variables to enviroment
  (Martin Schlemmer <azarah@nosferatu.za.org>),
 - autoconf: fixed filling MAIL_SPOOL_DIR and MAIL_SPOOL_FILE variables
-  which was always empty (Gregorio Guidi <g.guidi@sns.it>),
- really close security bug in libmisc/pwdcheck.c,
+  which was allways empty (Gregorio Guidi <g.guidi@sns.it>),
+- realuy closse security bug in libmisc/pwdcheck.c,
 - added missing template/example PAM service config files for chfn, chsh and
  userdel,
 - do not translate variable names from /etc/default/useradd during
@@ -1257,10 +812,10 @@ shadow-4.0.4.1 -> shadow-4.0.5						27-10-2004
 - change libmisc to private static library,
 - added SELinux support (basing on patch from Gentoo),
 - chage: more verbose/human readable -l output. This output is much more
-  better for send directly via email for each users as message with account
+  beter for send directly via email for each users as message with account
  status (for example as message with warning about account/password expiration),
 - login: fixed handle -f option: now it works correctly without specify "-h
-  <host>" if open login session locally is required (thanks for help
+  <host>" if open login session localy is required (thanks for help
  investigate bug for Krzysztof Kotlenga),
 - userdel: when removing a user with userdel, userdel was always exits with 1 (fixed).
  Based on http://bugs.gentoo.org/show_bug.cgi?id=66687,
@@ -1274,8 +829,8 @@ shadow-4.0.4.1 -> shadow-4.0.5						27-10-2004
  makes httpd Option SymlinkIfOwnerMatch break for default weg pages
  including symlinks placed into /etc/skel/public_html for example.
  http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=66819
- su: add pam_open_session() support. If built without PAM support
-  propagate $DISPLAY and $XAUTHORITY environment variables.
+- su: add pam_open_session() support. If builded without PAM support
+  propagate $DISPLAY and $XAUTHORITY enviroment variables.
  Based on http://www.gentoo.org/cgi-bin/viewcvs.cgi/sys-apps/shadow/files/shadow-4.0.4.1-su-pam_open_session.patch?rev=1.1
 - applied 036_pam_access_with_preauth.patch Debian patch submited by Bjorn
  Torkelsson <Bjorn.Torkelsson@hpc2n.umu.se>: add support for PAM account
@@ -1287,11 +842,11 @@ shadow-4.0.4.1 -> shadow-4.0.5						27-10-2004
    Use constant strings rather than argv[0] for syslog ident in the user
    management commands,
  shadow-4.0.4.1-owl-tmp.diff:
-    Remove using mktemp() if mkstemp() prototype not found (use always mkstemp()),
+    Remove using mktemp() if mkstemp() prototype not found (use allways mkstemp()),
  shadow-4.0.4.1-owl-check-reads.diff:
    Add checking for read errors in commonio and vipw/vigr (not doing so could
    result in data loss when the records are written back),
- fixed security bug in libmisc/pwdcheck.c which allow unauthorized
+- fixed securirty bug in libmisc/pwdcheck.c which allow unauthorized
  account properties modification.
  Affected tools: chfn and chsh.
  Bug was discovered by Martin Schulze <joey@infodrom.org>.
@@ -1307,12 +862,12 @@ shadow-4.0.4.1 -> shadow-4.0.5						27-10-2004

 shadow-4.0.4 => shadow-4.0.4.1						14-01-2004
 - bug fixes in automake files for generate correct tar ball on "make dist":
-  added missing "EXTRA_DIST = $(man_MANS)" in man/*/Makefile.am.
+  added mising "EXTRA_DIST = $(man_MANS)" in man/*/Makefile.am.

-shadow-4.0.3 => shadow-4.0.4						14-01-2004
+shadow-4.0.3 => shadow-4.0.4						14-01-2004	

 *** general:
- added missing information about -f options in groupadd usage message
+- added missing information about -f options in groupadd usage mesage
  (document this also in man page),
 - removed TCFS support (tcfs is dead),
 - convert all po/*.po files to utf-8,
@@ -1320,7 +875,7 @@ shadow-4.0.3 => shadow-4.0.4						14-01-2004
  per service flushing method instead HUPing nscd process),
 - removed old AUTH_METHODS dependent code,
 - chage: now all code depend on SHADOWPWD. If shadow will not be configured
-  on autoconf level for using shadow password chage is olny stub which
+  on autoconf level for using shadow possword chage is olny stub which
  informs "chage not configured for shadow password support."
 - dpasswd: removed,
 - login: remove handle login.defs::DIALUPS_CHECK_ENAB code,
@@ -1328,7 +883,7 @@ shadow-4.0.3 => shadow-4.0.4						14-01-2004
 - ALL tools, libraries: remove old SVR4, SVR4_SI86_EUA BSD_QUOTA and ATT_AGE
  dependent code,
 - ALL: ready for gettext 0.11.5, automake 1.7.4, autoconf 2.57,
- logoutd, userd: handle also utmpx if available,
+- logoutd, userd: handle also utmpx if avalaile,
 - newgrp: fix for non-PAM version
  Use CLOSE_SESSIONS depending code only when USE_PAM.
  The problem was reported by Mattias Webjorn Eriksson using Slackware
@@ -1356,7 +911,7 @@ shadow-4.0.3 => shadow-4.0.4						14-01-2004

 shadow-4.0.2 => shadow-4.0.3						 13-03-2002

- added various cs, de, fr, id, it, ko man pages found mainly in national
+- added variouse cs, de, fr, id, it, ko man pages found mainly in national
  man pages translations projects (this documents are not synced with
  current en version but you know .. "Documentations is lik sex. When it is
  good it very very good. Whet it is bad it is better than nothing."). Any
@@ -1372,9 +927,9 @@ shadow-4.0.2 => shadow-4.0.3						 13-03-2002
 shadow-4.0.1 => shadow-4.0.2						 17-02-2002

 - resolve many fuzzy translations also all this which may cause problems on
-  displaying long uid/gid,
- allow use "$" on ending in created by useradd username accounts for allow
-  create machine accounts for samba (thanks to Jerome Borsboom
+  displaing long uid/gid,
+- allow use "$" on ending in cereated by useradd usermname accounts for allow
+  create machine acounts for samba (thanks to Jerome Borsboom
  <borsboom@tch.fgg.eur.nl> for point this problem in 4.0.1),
 - fix small but ugly bug in configure.in in libpam_mics library detection.

@@ -1394,7 +949,7 @@ shadow-4.0.0 => shadow-4.0.1
    as root.  If root does read-only, there's no lock needed. Added missing
    "#include <errno.h>" for above (me).
  shadow-4.0.0-owl-warnings.diff
-    Olny one fix from this patch was applied because other was fixed few days
+    Olny one fix from this patch was aplayd because other was fixed few days
    before :)
  shadow-4.0.0-owl-check_names.diff
    Merge only prat this patch with checking login name matching; checking
@@ -1402,13 +957,13 @@ shadow-4.0.0 => shadow-4.0.1
    probably _POSIX_LOGIN_NAME_MAX from <bits/posix1_lim.h>,
  shadow-4.0.0-owl-chage-drop-priv.diff
  shadow-4.0.0-owl-pam-auth.diff
-    Merge part with reorder initialize PAM and checking if chage is runed by
+    Merge part with reorder initialize PAM and checkin is chage is runed by
    root or not - now chage can be runed from non-root account for checking
    by user own account information (if PAM enabled).
 - fixes for handle/print correctly 32bit uid/gid (Thorsten Kukuk <kukuk@suse.de>),
 - implemented functions for better reloading the nscd cache (per NSS map)
  (Thorsten Kukuk <kukuk@suse.de>),
- fixed warnings "not used but defined" on compile using gcc 3.0.x
+- fixed warnings "not used but defined" on compile using gcc 3.0.x 
  (bulletpr00ph <bullet@users.sourceforge.net>),
 - added ja, ko translations found in SuSE,
 - added symlinks: newgrp -> sg, vipw -> vigr,
@@ -1416,7 +971,7 @@ shadow-4.0.0 => shadow-4.0.1
 - added sg(1) man page as roff .so link to newgrp(1),
 - installed fix for SEGV when using pwck -s on /etc/passwd file with
  empty lines in it.
-
+  
 shadow-20001016 => shadow-4.0.0						 06-01-2002

 - fix bug discovered and fixed by Marcel Ritter
@@ -1446,30 +1001,30 @@ shadow-20001016 => shadow-4.0.0						 06-01-2002
 - much better automake support,
 - added pt_BR man pages for gpasswd(1), groupadd(8), groupdel(8),
  groupmod(8), shadow(5) (man pages for other nations also are welcome),
- many small fixes and updates nad improvements in man pages,
- applied Debian patch to man pages for shadowconfig,
+- mamny small fixes and updates nad improvements in man pages,
+- aplayed Debian patch to man pages for shadowconfig,
 - remove limit to 6 chars logged tty name (012_libmisc_sulog.c.diff Debian
  patch).

 shadow-20001012 -> shadow-20001016:
- conditionally disabled body reload_nscd() because not every
+- conditionaly disabled body reload_nscd() because not every
  version of nscd can handle it (this can be enabled by define
  ENABLE_NSCD_SIGHUP) (Marek Michałkiewicz  <marekm@linux.org.pl>)
 - fixes on autoconf/automake level for dist target,
- Julianne F. Haugh new contact address.
+- Julianne F. Haugh new contact adress.

 shadow-20000902 => shadow-20001012

- removed /redhat directory with obsoleted files (partially rewritten spec
+- removed /redhat directory with obsoleted files (partialy rewrited spec
  file is now in root directory),
- applied shadow-19990827-group.patch patch from RH wich prevents adduser
+- aplayed shadow-19990827-group.patch patch from RH wich prevents adduser
  overwrite previously existing groups in adduser,
 - added PAM support for chage (bind to "chage" PAM config file) also
  added PAM support for all other small tools like chpasswd, groupadd,
-  groupdel, groupmod, newusers, useradd, userdel, usermod (bind to common
-  "shadow" PAM config file) - this modifications mainly based on
+  groupdel, groupmod, newusers, useradd, userdel, usermod (bind to common 
+  "shadow" PAM config file) - this modificaytions mainly based on
  modifications prepared by Janek Rękojarski <baggins@pld.org.pl>,
- many small fixes and improvements in automake (mow "make dist"
+- many small fixes and improvments in automake (mow "make dist"
  works correctly),
 - added cs translation (Jiri Pavlovsky <Jiri.Pavlovsky@ff.cuni.cz>).

--- a/1
+++ b/1
@@ -1 +0,0 @@
-README.md
--- a/106
+++ b/106
@@ -0,0 +1,106 @@
+Shadow SITES
+============
+
+FTP site
+	ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow
+
+SVN repository
+	anonymous read only access: svn://svn.debian.org/pkg-shadow/
+
+SVN web interface
+	http://svn.debian.org/wsvn/pkg-shadow
+
+Mailing lists
+	for general discuss: pkg-shadow-devel@lists.alioth.debian.org
+	commit list: pkg-shadow-commits@lists.alioth.debian.org
+
+Mailing lists subscription
+	http://lists.alioth.debian.org/mailman/listinfo/pkg-shadow-devel
+	http://lists.alioth.debian.org/mailman/listinfo/pkg-shadow-commits
+
+Mailing lists archives:
+	http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/
+	http://lists.alioth.debian.org/pipermail/pkg-shadow-commits/
+
+S/Key support:
+	Shadow can be built with S/Key support using the S/Key package from:
+
+	http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libskey/
+	or
+	http://gentoo.osuosl.org/distfiles/skey-1.1.5.tar.bz2
+
+Authors and contributors
+========================
+
+Thanks to at least the following people for sending me patches, bug
+reports and various comments.  This list may be incomplete, I received
+a lot of mail...
+
+
+Adam Rudnicki <adam@v-lo.krakow.pl>
+Alan Curry <pacman@tardis.mars.net>
+Alexander O. Yuriev <alex@bach.cis.temple.edu>
+Algis Rudys <arudys@rice.edu>
+Andreas Jaeger <aj@arthur.rhein-neckar.de>
+Aniello Del Sorbo <anidel@edu-gw.dia.unisa.it>
+Anton Gluck <gluc@midway.uchicago.edu>
+Arkadiusz Miskiewicz <misiek@pld.org.pl>
+Ben Collins <bcollins@debian.org>
+Brian R. Gaeke <brg@dgate.org>
+Calle Karlsson <ckn@kash.se>
+Chip Rosenthal <chip@unicom.com>
+Chris Evans <lady0110@sable.ox.ac.uk>
+Cristian Gafton <gafton@sorosis.ro>
+Darcy Boese <possum@chardonnay.niagara.com>
+Dave Hagewood <admin@arrowweb.com>
+David A. Holland <dholland@hcs.harvard.edu>
+David Frey <David.Frey@lugs.ch>
+Ed Carp <ecarp@netcom.com>
+Floody <flood@evcom.net>
+Frank Denis <j@4u.net>
+George Kraft IV <gk4@us.ibm.com>
+Greg Mortensen <loki@world.std.com>
+Guido van Rooij
+Guy Maor <maor@debian.org>
+Hrvoje Dogan <hdogan@bjesomar.srce.hr>
+Janos Farkas <chexum@bankinf.banki.hu>
+Jay Soffian <jay@lw.net>
+Jesse Thilo <Jesse.Thilo@pobox.com>
+Joey Hess <joey@kite.ml.org>
+John Adelsberger <jja@umr.edu>
+Jonathan Hankins <jhankins@mailserv.homewood.k12.al.us>
+Jon Lewis <jlewis@lewis.org>
+Joshua Cowan <jcowan@hermit.reslife.okstate.edu>
+Judd Bourgeois <shagboy@bluesky.net>
+Juergen Heinzl <unicorn@noris.net>
+Juha Virtanen <jiivee@iki.fi>
+Julianne Frances Haugh <jockgrrl@ix.netcom.com>
+Leonard N. Zubkoff <lnz@dandelion.com>
+Luca Berra <bluca@www.polimi.it>
+Lutz Schwalowsky <schwalow@mineralogie.uni-hamburg.de>
+Marc Ewing <marc@redhat.com>
+Martin Bene <mb@sime.com>
+Martin Mares <mj@gts.cz>
+Michael Meskes <meskes@topsystem.de>
+Michael Talbot-Wilson <mike@calypso.bns.com.au>
+Mike Pakovic <mpakovic@users.southeast.net>
+Nicolas François <nicolas.francois@centraliens.net>
+Nikos Mavroyanopoulos <nmav@i-net.paiko.gr>
+Pavel Machek <pavel@bug.ucw.cz>
+Phillip Street
+Rafał Maszkowski <rzm@icm.edu.pl>
+Rani Chouha <ranibey@smartec.com>
+Sami Kerola <kerolasa@rocketmail.com>
+Shane Watts <shane@nexus.mlckew.edu.au>
+Steve M. Robbins <steve@nyongwa.montreal.qc.ca>
+Thorsten Kukuk <kukuk@suse.de>
+Tim Hockin <thockin@eagle.ais.net>
+Timo Karjalainen <timok@iki.fi>
+Ulisses Alonso Camaro <ulisses@pusa.eleinf.uv.es>
+Werner Fink <werner@suse.de>
+
+Maintainers
+===========
+
+Tomasz Kłoczko <kloczek@pld.org.pl> (2000-2006)
+
--- a/README.md
+++ b/README.md
@@ -1,41 +0,0 @@
-# shadow-utils
-
-## Introduction
-The shadow-utils package includes the necessary programs for
-converting UNIX password files to the shadow password format, plus
-programs for managing user and group accounts. The pwconv command
-converts passwords to the shadow password format. The pwunconv command
-unconverts shadow passwords and generates a passwd file (a standard
-UNIX password file). The pwck command checks the integrity of password
-and shadow files. The lastlog command prints out the last login times
-for all users. The useradd, userdel, and usermod commands are used for
-managing user accounts. The groupadd, groupdel, and groupmod commands
-are used for managing group accounts.
-
-## Sites
-* [Homepage](https://github.com/shadow-maint/shadow)
-* [Issue tracker](https://github.com/shadow-maint/shadow/issues)
-* [Releases](https://github.com/shadow-maint/shadow/releases)
-
-## Contacts
-There are several ways to contact us:
-* [the general discussion mailing list](
-  https://alioth-lists.debian.net/mailman/listinfo/pkg-shadow-devel)
-* the #shadow IRC channel on libera.chat:
-  * irc://irc.libera.chat/shadow
-
-### Mailing archives
-* [the general discussion mailing list archive](
-  https://alioth-lists.debian.net/pipermail/pkg-shadow-devel/)
-* [the commit mailing list archive](
-  https://alioth-lists-archive.debian.net/pipermail/pkg-shadow-commits/),
-  only used for historical purposes
-
-## Contributions
-
-Contributions are welcome. Follow the
-[guidelines](doc/contributions/introduction.md) before posting any patches.
-
-## Authors and maintainers
-Authors and maintainers are listed in [AUTHORS.md](
-https://github.com/shadow-maint/shadow/blob/master/AUTHORS.md).
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,12 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-At the moment only the latest release is supported.
-
-## Reporting a Vulnerability
-
-Security vulnerabilities may be reported to
-* Serge Hallyn <serge@hallyn.com> (B175CFA98F192AF2)
-* Christian Brauner <christian@brauner.io> (4880B8C9BD0E5106FC070F4F7B3C391EFEA93624)
-* Iker Pedrosa <ipedrosa@redhat.com> (4E80EF49C7987B6DE2F81F5005079C6C3A653E57)
--- a/121
+++ b/121
@@ -1,45 +1,11 @@
- * Create a common usage function that'd take the array of
-   long options and an array of descriptions and output that so things would
-   be standardized across the utils.
-   Usage strings should be normalized and split first.
-   Investigate optparse.
+passwd -l should lock the password, not the account.

+vipw: Test SHADOWGRP support before using gshadow features.

-/etc/default/useradd
- * GROUP=1000 should accept a group name.
+PAM: add support for customization of the PAM support (i.e. support the
+Debian PAM configuration)

-Check when RLOGIN is enabled if ruserok() exists
-
-Move selinux_file_context out of libmisc/copydir.c
-
-Review hardcoded root account?
-
-review all call to strto
-
-libmisc/cleanup_user.c
-	cleanup needed (cleanup_report_add_user* not used)
-
-
-libxcrypt support
- * http://wiki.linuxfromscratch.org/patches/browser/trunk/shadow/shadow-4.0.18.1-owl_blowfish-1.patch
-
-implement getlong, getulong.
-	avoid atoi, atol, atoul, strtol, strtoul, ...
-
-manpages: comment the RLOGIN parts
-
-Replace build_list (in lib/gshadow.c) and list (in lib/sgetgrent.c) by
-comma_to_list()
-
-Revert the modified files if all files could not be changed.
-  * or warn and indicate which files were modified and which were not.
-  * check the order the files are modified.
-
-report nscd_flush_cache failures?
-call nscd from the programs or from lib (commonio?)
-
-PAM: check if a non-interactive conversation function could be used to set
-the password in chpasswd and newusers
+PAM: check if a non-interactive conversation function could be used to 

 WITH_SELINUX
  - review all tools to check that the strategies are consistent
@@ -47,20 +13,33 @@ WITH_SELINUX
 chage, chfn, chsh: same change needed as in passwd.
  - probably need moving check_selinux_access to a separate file.

+man useradd
+	document default behavior for GROUP
+	remove "The default group number is 1 or whatever is..."
+
+useradd manpage
+  - add -k option
+  - mention that -o require -u
+
 testsuite
 - newgrp
   - test with unknown user's GID

 newusers
 - add logging to SYSLOG & AUDIT
- - use CREATE_HOME
- - Add a -Z option (see useradd / usermod)
+
+faillog
+ - accept numerical user and range of users

 Document when/where option appeared, document whether an option is standard
 or not.

+depends rules for the manpages
+
 Check all the expiry semantics

+Add options --crypt-method and --sha-rounds to gpasswd
+
 ALL:
 - move base passwd/shadow/group/gshadow operation to module for allow write
  different backend modules for db, NIS, LDAP and others. Default backend it
@@ -70,58 +49,38 @@ ALL:
  passwd have old piece of code with handling -r option and it will be good
  finish this and propagate on other shadow tools for allow operate on other
  user databases by well known tools.
- Protect against signals. Register do_cleanups in a signal handler.
-
- login.defs
-  - generate depending on configuration

 - useradd:
  - add handle create user mail spool in maildir format.
-  - Add support for -k in -D mode
-  - Add support for -K in -D mode
-  - Add option to create or not the mail spool (and set the default in -D
-    mode)
-  - Change -l to reset the entry if an entry was already there
-  - set the mask in mkdir?
+
+- add handle -n switch in groups and id command for allow query is
+  group/user with specified id/gid exist - this will be very usable
+  on automation in packages for query/check is group/user exist in system
+  or not,
+
+- groupmems: 
+  - need some work on add PAM and i18n support.

 - userdel:
  - add backup option for the removal of user resources,
+  - add lookop and remove per user group.
  - user_busy: check that the user is not running any processes.
-  - missing "deleting group" FAILED
-  - home dir removed, but userdel may fail and may leave the user
-    => warning needed
-
- usermod
-  - add an option equivalent to useradd's -l (only when uid is changed)
-  - the mode of new home directories should be set according to the
-    original mode. Does copy_tree does this?
-  - user renamed, order is not kept in /etc/group (see
-    47_usermod-l_no_shadow_file). This is a problem when the first user is
-    considered as the admin.
-  - see mail "user ID change" on  April, 15
-    + fix call to chown (combination of -m and -u/-g)
-    + add tests

 - passwd:
  - check combination of options (e.g. -u/-l)
-  - when -u refuse to unlock because it would create an empty password, it
-    should not display "Password changed."
-    exit instead?

 - newgrp: check the USE_PAM section.

- pwck
-  - Add check to move passwd passwords to shadow if there is a shadow
-    entry (with a password).
-  - Add check to move passwd passwords to shadow if there is a shadow
-    file.
-  - Support an alternative /etc/tcb directory as second parameter.
-  - add options -g / -G to specify alternative group / gshadow files
+- groupmems: check reason for isgroup

- su
-  - add a login.defs configuration parameter to add variables to keep in
-    the environment with "su -l" (TERM/TERMCOLOR/...)
+- newusers: doc for pw_gid not clear. Differentiate
+            pw_gid specified and exist
+            pw_gid specified but does not exist
+             * name
+             * number
+            pw_gid not specified.
+- newusers: document what happens when no uid is specified.
+- newusers: add option --system?

- vipw
-  - set ACLs and XATTRs on the temporary file (and backups?)
-  - vipw + selinux -> use lib/selinux.c
+-Documentation:
+ * document when options were added.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -6,7 +6,7 @@ AC_DEFUN([JH_PATH_XML_CATALOG],
 [
  # check for the presence of the XML catalog
  AC_ARG_WITH([xml-catalog],
-              AS_HELP_STRING([--with-xml-catalog=CATALOG],
+              AC_HELP_STRING([--with-xml-catalog=CATALOG],
                             [path to xml catalog to use]),,
              [with_xml_catalog=/etc/xml/catalog])
  jh_found_xmlcatalog=true
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,10 @@
 #! /bin/sh
-
 autoreconf -v -f --install || exit 1
-
 ./configure \
 	CFLAGS="-O2 -Wall" \
-	--enable-lastlog \
 	--enable-man \
 	--enable-maintainer-mode \
-	--enable-shared \
+	--disable-shared \
 	--without-libpam \
 	--with-selinux \
 	"$@"
--- a/configure.ac
+++ b/configure.ac
@@ -1,794 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.69])
-m4_define([libsubid_abi_major], 4)
-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.14.0-rc3], [pkg-shadow-devel@lists.alioth.debian.org], [],
-	[https://github.com/shadow-maint/shadow])
-AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
-AC_CONFIG_MACRO_DIRS([m4])
-AM_SILENT_RULES([yes])
-AC_CONFIG_HEADERS([config.h])
-
-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=""
-
-AC_USE_SYSTEM_EXTENSIONS
-
-AC_ENABLE_STATIC
-AC_ENABLE_SHARED
-
-AM_MAINTAINER_MODE
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_LN_S
-AC_PROG_YACC
-LT_INIT
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_CHECK_HEADERS(crypt.h utmp.h \
-	termio.h sgtty.h sys/ioctl.h paths.h \
-	sys/capability.h sys/random.h \
-	gshadow.h lastlog.h rpc/key_prot.h acl/libacl.h \
-	attr/libattr.h attr/error_context.h)
-
-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_FUNCS(arc4random_buf futimes \
-	getentropy getrandom getspnam getusershell \
-	initgroups lckpwdf lutimes mempcpy \
-	setgroups updwtmp updwtmpx innetgr \
-	getspnam_r \
-	rpmatch \
-	memset_explicit explicit_bzero stpecpy stpeprintf)
-AC_SYS_LARGEFILE
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-AC_CHECK_MEMBERS([struct utmp.ut_type,
-                  struct utmp.ut_id,
-                  struct utmp.ut_name,
-                  struct utmp.ut_user,
-                  struct utmp.ut_host,
-                  struct utmp.ut_syslen,
-                  struct utmp.ut_addr,
-                  struct utmp.ut_addr_v6,
-                  struct utmp.ut_time,
-                  struct utmp.ut_xtime,
-                  struct utmp.ut_tv],,,[[#include <utmp.h>]])
-
-dnl Checks for library functions.
-AC_TYPE_GETGROUPS
-AC_FUNC_UTIME_NULL
-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'])])
-
-if test "$ac_cv_header_shadow_h" = "yes"; then
-	AC_CACHE_CHECK(for working shadow group support,
-		ac_cv_libc_shadowgrp,
-		AC_RUN_IFELSE([AC_LANG_SOURCE([
-				#include <shadow.h>
-				#ifdef HAVE_GSHADOW_H
-				#include <gshadow.h>
-				#endif
-				int
-				main()
-				{
-					struct sgrp *sg = sgetsgent("test:x::");
-					/* NYS libc on Red Hat 3.0.3 has broken shadow group support */
-					return !sg || !sg->sg_adm || !sg->sg_mem;
-				}]
-			)],
-			[ac_cv_libc_shadowgrp=yes],
-			[ac_cv_libc_shadowgrp=no],
-			[ac_cv_libc_shadowgrp=no]
-		)
-	)
-
-	if test "$ac_cv_libc_shadowgrp" = "yes"; then
-		AC_DEFINE(HAVE_SHADOWGRP, 1, [Have working shadow group support in libc])
-	fi
-fi
-
-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",
-		[Location of system mail spool directory.])
-fi
-
-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",
-		[Name of user's mail spool file if stored in user's home directory.])
-fi
-
-AC_CACHE_CHECK([location of utmp], shadow_cv_utmpdir,
-[for shadow_cv_utmpdir in /var/run /var/adm /usr/adm /etc none; do
-	if test -f $shadow_cv_utmpdir/utmp; then
-		break
-	fi
-done])
-if test "$shadow_cv_utmpdir" = "none"; then
-	AC_MSG_WARN(utmp file not found)
-fi
-AC_DEFINE_UNQUOTED(_UTMP_FILE, "$shadow_cv_utmpdir/utmp",
-	[Path for utmp file.])
-
-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",
-	[Path for faillog file.])
-
-AC_CACHE_CHECK([location of the passwd program], shadow_cv_passwd_dir,
-[if test -f /usr/bin/passwd; then
-	shadow_cv_passwd_dir=/usr/bin
-else
-	shadow_cv_passwd_dir=/bin
-fi])
-AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd",
-	[Path to passwd program.])
-
-dnl XXX - quick hack, should disappear before anyone notices :).
-dnl XXX - I just read the above message :).
-if test "$ac_cv_func_ruserok" = "yes"; then
-	AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
-	AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
-fi
-
-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) ;;
-	 esac],
-	[enable_shadowgrp="yes"]
-)
-
-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,
-	[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)
-	   ;;
-	 esac],
-	[enable_acct_tools_setuid="no"]
-)
-
-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,
-	[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}"],
-	[enable_logind="yes"]
-)
-
-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,
-	[AS_HELP_STRING([--with-libpam], [use libpam for PAM support @<:@default=yes if found@:>@])],
-	[with_libpam=$withval], [with_libpam=maybe])
-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,
-	[AS_HELP_STRING([--with-selinux], [use SELinux support @<:@default=yes if found@:>@])],
-	[with_selinux=$withval], [with_selinux=maybe])
-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,
-	[AS_HELP_STRING([--with-attr], [use Extended Attribute support @<:@default=yes if found@:>@])],
-	[with_attr=$withval], [with_attr=maybe])
-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,
-	[AS_HELP_STRING([--with-tcb], [use tcb support (incomplete) @<:@default=yes if found@:>@])],
-	[with_tcb=$withval], [with_tcb=maybe])
-AC_ARG_WITH(libcrack,
-	[AS_HELP_STRING([--with-libcrack], [use libcrack @<:@default=no@:>@])],
-	[with_libcrack=$withval], [with_libcrack=no])
-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,
-	[AS_HELP_STRING([--with-bcrypt], [allow the bcrypt password encryption algorithm @<:@default=no@:>@])],
-	[with_bcrypt=$withval], [with_bcrypt=no])
-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,
-	[AS_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])],
-	[with_nscd=$withval], [with_nscd=yes])
-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,
-	[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,
-	[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,
-	[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
-	with_group_name_max_length=0
-elif test "$with_group_name_max_length" = "yes" ; 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)
-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])
-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])
-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])
-fi
-
-if test "$with_nscd" = "yes"; 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])],
-	              [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]))
-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_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([VENDORDIR], [$enable_vendordir])
-if test "x$enable_vendordir" != x; then
-	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.])
-fi
-AM_CONDITIONAL(SHADOWGRP, test "x$enable_shadowgrp" = "xyes")
-
-if test "$enable_man" = "yes"; then
-	dnl
-	dnl Check for xsltproc
-	dnl
-	AC_PATH_PROG([XSLTPROC], [xsltproc])
-	if test -z "$XSLTPROC"; then
-		enable_man=no
-		AC_MSG_ERROR([xsltproc is missing.])
-	fi
-
-	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)
-	JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-		[DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no)
-fi
-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"])
-
-	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.])
-		enable_subids="yes"
-	else
-		if test "x$enable_subids" = "xyes"; then
-			AC_MSG_ERROR([Cannot enable support the subordinate IDs on systems where gid_t or uid_t has less than 32 bits])
-		fi
-		enable_subids="no"
-	fi
-fi
-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;]
-				)],
-			[ac_cv_struct_lastlog_ll_host=yes],
-			[ac_cv_struct_lastlog_ll_host=no]
-		)
-	)
-
-	if test "$ac_cv_struct_lastlog_ll_host" = "yes"; then
-		AC_DEFINE(HAVE_LL_HOST, 1,
-			[Define if struct lastlog has ll_host])
-		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_subids="no"
-	fi
-fi
-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"])
-fi
-AM_CONDITIONAL(ENABLE_LOGIND, test "x$enable_logind" != "xno")
-
-AC_SUBST(LIBCRYPT)
-AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
-	[AC_MSG_ERROR([crypt() not found])])
-
-AC_SUBST(LIYESCRYPT)
-AC_CHECK_LIB(crypt, crypt, [LIYESCRYPT=-lcrypt],
-	[AC_MSG_ERROR([crypt() not found])])
-
-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"], [
-		PKG_CHECK_MODULES([LIBBSD], [libbsd-overlay])
-	])
-	dnl Make sure either the libc or libbsd provide the header.
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $LIBBSD_CFLAGS"
-	AC_CHECK_HEADERS([readpassphrase.h])
-	AS_IF([test "$ac_cv_header_readpassphrase_h" != "yes"], [
-		AC_MSG_ERROR([readpassphrase.h is missing])
-	])
-	CFLAGS="$save_CFLAGS"
-	AC_DEFINE(WITH_LIBBSD, 1, [Build shadow with libbsd support])
-else
-	AC_DEFINE(WITH_LIBBSD, 0, [Build shadow without libbsd support])
-fi
-AM_CONDITIONAL(WITH_LIBBSD, test x$with_libbsd = xyes)
-
-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_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,
-		                           [acl_lib="yes"],
-		                           [acl_lib="no"])],
-		             [acl_lib="no"])
-		if test "$acl_lib$with_acl" = "noyes" ; then
-			AC_MSG_ERROR([libacl not found])
-		elif test "$acl_lib" = "no" ; then
-			with_acl="no"
-		else
-			AC_DEFINE(WITH_ACL, 1,
-			          [Build shadow with ACL support])
-			LIBACL="-lacl"
-			with_acl="yes"
-		fi
-	else
-		with_acl="no"
-	fi
-fi
-
-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_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,
-		                           [attr_lib="yes"],
-		                           [attr_lib="no"])],
-		             [attr_lib="no"])
-		if test "$attr_lib$with_attr" = "noyes" ; then
-			AC_MSG_ERROR([libattr not found])
-		elif test "$attr_lib" = "no" ; then
-			with_attr="no"
-		else
-			AC_DEFINE(WITH_ATTR, 1,
-			          [Build shadow with Extended Attributes support])
-			LIBATTR="-lattr"
-			with_attr="yes"
-		fi
-	else
-		with_attr="no"
-	fi
-fi
-
-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_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
-			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,
-		             [audit_lib="yes"], [audit_lib="no"])
-		if test "$audit_lib$with_audit" = "noyes" ; then
-			AC_MSG_ERROR([libaudit not found])
-		elif test "$audit_lib" = "no" ; then
-			with_audit="no"
-		else
-			AC_DEFINE(WITH_AUDIT, 1,
-			          [Define if you want to enable Audit messages])
-			LIBAUDIT="-laudit"
-			with_audit="yes"
-		fi
-	else
-		with_audit="no"
-	fi
-fi
-
-AC_SUBST(LIBCRACK)
-if test "$with_libcrack" = "yes"; then
-	echo "checking cracklib flavour, don't be surprised by the results"
-	AC_CHECK_LIB(crack, FascistCheck,
-		[LIBCRACK=-lcrack AC_DEFINE(HAVE_LIBCRACK, 1, [Defined if you have libcrack.])])
-	AC_CHECK_LIB(crack, FascistHistory,
-		AC_DEFINE(HAVE_LIBCRACK_HIST, 1, [Defined if you have the ts&szs cracklib.]))
-	AC_CHECK_LIB(crack, FascistHistoryPw,
-		AC_DEFINE(HAVE_LIBCRACK_PW, 1, [Defined if it includes *Pw functions.]))
-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
-		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])
-		with_btrfs="yes"
-	fi
-fi
-AM_CONDITIONAL(WITH_BTRFS, test x$with_btrfs = xyes)
-
-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_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_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
-			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_MSG_ERROR([libsemanage not found])
-		fi
-
-		if test "$selinux_lib$semanage_lib" = "yesyes" ; then
-			AC_DEFINE(WITH_SELINUX, 1,
-			          [Build shadow with SELinux support])
-			LIBSELINUX="-lselinux"
-			LIBSEMANAGE="-lsemanage"
-			with_selinux="yes"
-		else
-			with_selinux="no"
-		fi
-	else
-		with_selinux="no"
-	fi
-fi
-
-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_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
-			AC_MSG_ERROR([libtcb not found])
-		elif test "$tcb_lib" = "no" ; then
-			with_tcb="no"
-		else
-			AC_DEFINE(WITH_TCB, 1, [Build shadow with tcb support (incomplete)])
-			LIBTCB="-ltcb"
-			with_tcb="yes"
-		fi
-	else
-		with_tcb="no"
-	fi
-fi
-AM_CONDITIONAL(WITH_TCB, test x$with_tcb = xyes)
-
-AC_SUBST(LIBPAM)
-if test "$with_libpam" != "no"; then
-	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)
-	fi
-
-	LIBPAM="-lpam"
-	pam_conv_function="no"
-
-	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"])
-	            )
-
-	if test "$pam_conv_function$with_libpam" = "noyes" ; 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)
-	fi
-
-
-	if test "$pam_lib$pam_headers_found" = "yesyes" -a "$pam_conv_function" != "no" ; then
-		with_libpam="yes"
-	else
-		with_libpam="no"
-		unset LIBPAM
-	fi
-fi
-dnl Now with_libpam is either yes or no
-if test "$with_libpam" = "yes"; then
-	AC_CHECK_DECLS([PAM_ESTABLISH_CRED,
-	                PAM_DELETE_CRED,
-	                PAM_NEW_AUTHTOK_REQD,
-	                PAM_DATA_SILENT],
-	               [], [], [#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'])])
-	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_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)
-fi
-
-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)
-		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,
-		          [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")
-
-
-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")
-
-if test "x$with_fcaps" = "xyes"; then
-	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_MSG_ERROR([liskey 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_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])],[])
-fi
-
-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.])
-
-AM_GNU_GETTEXT_VERSION([0.19])
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" = "xyes")
-
-AC_CONFIG_FILES([
-	Makefile
-	po/Makefile.in
-	doc/Makefile
-	man/Makefile
-	man/config.xml
-	man/po/Makefile
-	man/cs/Makefile
-	man/da/Makefile
-	man/de/Makefile
-	man/es/Makefile
-	man/fi/Makefile
-	man/fr/Makefile
-	man/hu/Makefile
-	man/id/Makefile
-	man/it/Makefile
-	man/ja/Makefile
-	man/ko/Makefile
-	man/pl/Makefile
-	man/pt_BR/Makefile
-	man/ru/Makefile
-	man/sv/Makefile
-	man/tr/Makefile
-	man/uk/Makefile
-	man/zh_CN/Makefile
-	man/zh_TW/Makefile
-	libmisc/Makefile
-	lib/Makefile
-	libsubid/Makefile
-	libsubid/subid.h
-	src/Makefile
-	contrib/Makefile
-	etc/Makefile
-	etc/pam.d/Makefile
-	shadow.spec
-])
-AC_OUTPUT
-
-echo
-echo "shadow will be compiled with the following features:"
-echo
-echo "	auditing support:		$with_audit"
-echo "	CrackLib support:		$with_libcrack"
-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
--- a/configure.in
+++ b/configure.in
@@ -0,0 +1,430 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT
+AM_INIT_AUTOMAKE(shadow, 4.1.2)
+AC_CONFIG_HEADERS([config.h])
+
+dnl Some hacks...
+test "$prefix" = "NONE" && prefix="/usr"
+test "$prefix" = "/usr" && exec_prefix=""
+
+AC_GNU_SOURCE
+
+AM_DISABLE_SHARED
+AM_ENABLE_STATIC
+
+AM_MAINTAINER_MODE
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_ISC_POSIX
+AC_PROG_LN_S
+AC_PROG_YACC
+AM_C_PROTOTYPES
+AM_PROG_LIBTOOL
+
+dnl Checks for libraries.
+
+dnl Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+
+AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h \
+	utmpx.h termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h \
+	utime.h ulimit.h sys/resource.h gshadow.h lastlog.h \
+	locale.h rpc/key_prot.h netdb.h)
+
+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_FUNCS(l64a fchmod fchown fsync getgroups gethostname getspnam \
+	gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \
+	memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \
+	getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
+AC_SYS_LARGEFILE
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_UID_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_MODE_T
+AC_HEADER_STAT
+AC_CHECK_MEMBERS([struct stat.st_rdev])
+AC_HEADER_TIME
+AC_STRUCT_TM
+
+if test "$ac_cv_header_utmp_h" = "yes"; then
+	AC_CACHE_CHECK(for ut_host in struct utmp,
+		ac_cv_struct_utmp_ut_host,
+		AC_COMPILE_IFELSE(
+			[AC_LANG_PROGRAM([#include <utmp.h>],
+				[struct utmp ut; char *cp = ut.ut_host;]
+			)],
+			[ac_cv_struct_utmp_ut_host=yes],
+			[ac_cv_struct_utmp_ut_host=no]
+		)
+	)
+
+	if test "$ac_cv_struct_utmp_ut_host" = "yes"; then
+		AC_DEFINE(UT_HOST, 1, [Define if you have ut_host in struct utmp.])
+	fi
+
+	AC_CACHE_CHECK(for ut_user in struct utmp,
+		ac_cv_struct_utmp_ut_user,
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <utmp.h>],
+				[struct utmp ut; char *cp = ut.ut_user;]
+			)],
+			[ac_cv_struct_utmp_ut_user=yes],
+			[ac_cv_struct_utmp_ut_user=no]
+		)
+	)
+
+	if test "$ac_cv_struct_utmp_ut_user" = "no"; then
+		AC_DEFINE(ut_user, ut_name,
+			[Define to ut_name if struct utmp has ut_name (not ut_user).])
+	fi
+fi
+
+if 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;]
+				)],
+			[ac_cv_struct_lastlog_ll_host=yes],
+			[ac_cv_struct_lastlog_ll_host=no]
+		)
+	)
+
+	if test "$ac_cv_struct_lastlog_ll_host" = "yes"; then
+		AC_DEFINE(HAVE_LL_HOST, 1,
+			[Define if struct lastlog has ll_host])
+	fi
+fi
+
+dnl Checks for library functions.
+AC_TYPE_GETGROUPS
+AC_TYPE_SIGNAL
+AC_FUNC_UTIME_NULL
+AC_FUNC_STRFTIME
+AC_REPLACE_FUNCS(mkdir putgrent putpwent putspent rename rmdir)
+AC_REPLACE_FUNCS(sgetgrent sgetpwent sgetspent)
+AC_REPLACE_FUNCS(snprintf strcasecmp strdup strerror strstr)
+
+AC_CHECK_FUNC(setpgrp)
+AC_FUNC_SETPGRP
+
+if test "$ac_cv_header_shadow_h" = "yes"; then
+	AC_CACHE_CHECK(for working shadow group support,
+		ac_cv_libc_shadowgrp,
+		AC_RUN_IFELSE([AC_LANG_SOURCE([
+				#include <shadow.h>
+				main()
+				{
+					struct sgrp *sg = sgetsgent("test:x::");
+					/* NYS libc on Red Hat 3.0.3 has broken shadow group support */
+					return !sg || !sg->sg_adm || !sg->sg_mem;
+				}]
+			)],
+			[ac_cv_libc_shadowgrp=yes],
+			[ac_cv_libc_shadowgrp=no],
+			[ac_cv_libc_shadowgrp=no]
+		)
+	)
+
+	if test "$ac_cv_libc_shadowgrp" = "yes"; then
+		AC_DEFINE(HAVE_SHADOWGRP, 1, [Have working shadow group support in libc])
+	fi
+fi
+
+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",
+		[Location of system mail spool directory.])
+fi
+
+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",
+		[Name of user's mail spool file if stored in user's home directory.])
+fi
+
+AC_CACHE_CHECK([location of utmp], shadow_cv_utmpdir,
+[for shadow_cv_utmpdir in /var/run /var/adm /usr/adm /etc none; do
+	if test -f $shadow_cv_utmpdir/utmp; then
+		break
+	fi
+done])
+if test "$shadow_cv_utmpdir" = "none"; then
+	AC_MSG_WARN(utmp file not found)
+fi
+AC_DEFINE_UNQUOTED(_UTMP_FILE, "$shadow_cv_utmpdir/utmp",
+	[Path for utmp file.])
+
+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",
+	[Path for faillog file.])
+
+AC_CACHE_CHECK([location of the passwd program], shadow_cv_passwd_dir,
+[if test -f /usr/bin/passwd; then
+	shadow_cv_passwd_dir=/usr/bin
+else
+	shadow_cv_passwd_dir=/bin
+fi])
+AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd",
+	[Path to passwd program.])
+
+dnl XXX - quick hack, should disappear before anyone notices :).
+AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().])
+AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
+AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
+
+AC_ARG_ENABLE(shadowgrp,
+	[AC_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) ;;
+	 esac],
+	[enable_shadowgrp="yes"]
+)
+
+AC_ARG_ENABLE(man,
+	[AC_HELP_STRING([--enable-man],
+		[regenerate roff man pages from Docbook @<:@default=no@:>@])],
+	[enable_man=yes],
+        [enable_man=no]
+)
+
+AC_ARG_WITH(audit, 
+	[AC_HELP_STRING([--with-audit], [use auditing support @<:@default=yes if found@:>@])],
+	[with_audit=$withval], [with_audit=maybe])
+AC_ARG_WITH(libpam,
+	[AC_HELP_STRING([--with-libpam], [use libpam for PAM support @<:@default=yes if found@:>@])],
+	[with_libpam=$withval], [with_libpam=maybe])
+AC_ARG_WITH(selinux,
+	[AC_HELP_STRING([--with-selinux], [use SELinux support @<:@default=yes if found@:>@])],
+	[with_selinux=$withval], [with_selinux=maybe])
+AC_ARG_WITH(skey,
+	[AC_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])],
+	[with_skey=$withval], [with_skey=no])
+AC_ARG_WITH(libcrack,
+	[AC_HELP_STRING([--with-libcrack], [use libcrack @<:@default=yes if found and if PAM not enabled@:>@])],
+	[with_libcrack=$withval], [with_libcrack=no])
+AC_ARG_WITH(sha-crypt,
+	[AC_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])],
+	[with_sha_crypt=$withval], [with_sha_crypt=yes])
+
+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])
+fi
+
+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(inet_ntoa, inet)
+AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(gethostbyname, nsl)
+
+if test "$enable_shadowgrp" = "yes"; then
+	AC_DEFINE(SHADOWGRP, 1, [Define to support the shadow group file.])
+fi
+AM_CONDITIONAL(SHADOWGRP, test "x$enable_shadowgrp" = "xyes")
+
+if test "$enable_man" = "yes"; then
+	dnl
+	dnl Check for xsltproc
+	dnl
+	AC_PATH_PROG([XSLTPROC], [xsltproc])
+	if test -z "$XSLTPROC"; then
+		enable_man=no
+	fi
+
+	dnl check for DocBook DTD and stylesheets in the local catalog.
+	JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
+		[DocBook XML DTD V4.1.2], [], 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)
+fi
+AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
+
+AC_SUBST(LIBCRYPT)
+AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
+	[AC_MSG_ERROR([crypt() not found])])
+
+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_MSG_ERROR([libaudit.h is missing])
+	elif test "$audit_header" = "yes"; then
+		AC_CHECK_LIB(audit, audit_log_acct_message,
+		             [audit_lib="yes"], [audit_lib="no"])
+		if test "$audit_lib$with_audit" = "noyes" ; then
+			AC_MSG_ERROR([libaudit not found])
+		elif test "$audit_lib" = "no" ; then
+			with_audit="no"
+		else
+			AC_DEFINE(WITH_AUDIT, 1,
+			          [Define if you want to enable Audit messages])
+			LIBAUDIT="-laudit"
+			with_audit="yes"
+		fi
+	else
+		with_audit="no"
+	fi
+fi
+
+AC_SUBST(LIBCRACK)
+if test "$with_libcrack" = "yes"; then
+	echo "checking cracklib flavour, don't be surprised by the results"
+	AC_CHECK_LIB(crack, FascistCheck,
+		[LIBCRACK=-lcrack AC_DEFINE(HAVE_LIBCRACK, 1, [Defined if you have libcrack.])])
+	AC_CHECK_LIB(crack, FascistHistory,
+		AC_DEFINE(HAVE_LIBCRACK_HIST, 1, [Defined if you have the ts&szs cracklib.]))
+	AC_CHECK_LIB(crack, FascistHistoryPw,
+		AC_DEFINE(HAVE_LIBCRACK_PW, 1, [Defined if it includes *Pw functions.]))
+fi
+
+AC_SUBST(LIBSELINUX)
+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_MSG_ERROR([selinux/selinux.h is missing])
+	elif test "$selinux_header" = "yes" ; then
+		AC_CHECK_LIB(selinux, is_selinux_enabled,
+		             [selinux_lib="yes"], [selinux_lib="no"])
+		if test "$selinux_lib$with_selinux" = "noyes" ; then
+			AC_MSG_ERROR([libselinux not found])
+		elif test "$selinux_lib" = "no" ; then
+			with_selinux="no"
+		else
+			AC_DEFINE(WITH_SELINUX, 1,
+			          [Build shadow with SELinux support])
+			LIBSELINUX="-lselinux"
+			with_selinux="yes"
+		fi
+	else
+		with_selinux="no"
+	fi
+fi
+
+AC_SUBST(LIBPAM)
+if test "$with_libpam" != "no"; then
+	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)
+	fi
+
+	AC_CHECK_LIB(pam_misc, main,
+	             [pam_misc_lib="yes"], [pam_misc_lib="no"])
+	if test "$pam_misc_lib$with_libpam" = "noyes" ; then
+		AC_MSG_ERROR(libpam_misc not found)
+	fi
+
+	if test "$pam_lib$pam_misc_lib" = "yesyes" ; then
+		with_libpam="yes"
+	else
+		with_libpam="no"
+	fi
+fi
+dnl Now with_libpam is either yes or no
+if test "$with_libpam" = "yes"; then
+	AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])
+	AM_CONDITIONAL(USE_PAM, [true])
+	LIBPAM="-lpam -lpam_misc"
+	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)
+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_MSG_ERROR([liskey 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_TRY_COMPILE([
+		#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])])
+fi
+
+AM_GNU_GETTEXT_VERSION(0.16)
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" = "xyes")
+
+AC_CONFIG_FILES([
+	Makefile
+	po/Makefile.in
+	doc/Makefile
+	man/Makefile
+	man/po/Makefile.in
+	man/cs/Makefile
+	man/de/Makefile
+	man/es/Makefile
+	man/fi/Makefile
+	man/fr/Makefile
+	man/hu/Makefile
+	man/id/Makefile
+	man/it/Makefile
+	man/ja/Makefile
+	man/ko/Makefile
+	man/pl/Makefile
+	man/pt_BR/Makefile
+	man/ru/Makefile
+	man/sv/Makefile
+	man/tr/Makefile
+	man/zh_CN/Makefile
+	man/zh_TW/Makefile
+	libmisc/Makefile
+	lib/Makefile
+	src/Makefile
+	contrib/Makefile
+	etc/Makefile
+	etc/pam.d/Makefile
+	shadow.spec
+])
+AC_OUTPUT
+
+echo
+echo "shadow will be compiled with the following features:"
+echo
+echo "	auditing support:		$with_audit"
+echo "	CrackLib support:		$with_libcrack"
+echo "	PAM support:			$with_libpam"
+echo "	SELinux support:		$with_selinux"
+echo "	shadow group support:		$enable_shadowgrp"
+echo "	S/Key support:			$with_skey"
+echo "	SHA passwords encryption:	$with_sha_crypt"
+echo
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,6 +1,6 @@
 # This is a dummy Makefile.am to get automake work flawlessly,
 # and also cooperate to make a distribution for `make dist'

-EXTRA_DIST = README adduser.c adduser.sh adduser2.sh \
- atudel groupmems.shar shadow-anonftp.patch \
+EXTRA_DIST = README adduser.c adduser-old.c adduser.sh adduser2.sh \
+ atudel groupmems.shar pwdauth.c shadow-anonftp.patch \
 udbachk.tgz
--- a/contrib/adduser-old.c
+++ b/contrib/adduser-old.c
@@ -0,0 +1,300 @@
+/****
+** 03/17/96
+** hacked a bit more, removed unused code, cleaned up for gcc -Wall.
+** --marekm
+**
+** 02/26/96
+** modified to call shadow utils (useradd,chage,passwd) on shadowed 
+** systems - Cristian Gafton, gafton@sorosis.ro
+**
+** 6/27/95
+** shadow-adduser 1.4:
+**
+** now it copies the /etc/skel dir into the person's dir, 
+** makes the mail folders, changed some defaults and made a 'make 
+** install' just for the hell of it.
+**
+** Greg Gallagher
+** CIN.Net
+**
+** 1/28/95
+** shadow-adduser 1.3:
+** 
+** Basically a bug-fix on my additions in 1.2.  Thanx to Terry Stewart 
+** (stew@texas.net) for pointing out one of the many idiotic bugs I introduced.
+** It was such a stupid bug that I would have never seen it myself.
+**
+**                                Brandon
+*****
+** 01/27/95
+** 
+** shadow-adduser 1.2:
+** I took the C source from adduser-shadow (credits are below) and made
+** it a little more worthwhile.  Many small changes... Here's
+** the ones I can remember:
+** 
+** Removed support for non-shadowed systems (if you don't have shadow,
+**     use the original adduser, don't get this shadow version!)
+** Added support for the correct /etc/shadow fields (Min days before
+**     password change, max days before password change, Warning days,
+**     and how many days from expiry date does the account go invalid)
+**     The previous version just left all of those fields blank.
+**     There is still one field left (expiry date for the account, period)
+**     which I have left blank because I do not use it and didn't want to
+**     spend any more time on this.  I'm sure someone will put it in and
+**     tack another plethora of credits on here. :)
+** Added in the password date field, which should always reflect the last
+**     date the password was changed, for expiry purposes.  "passwd" always
+**     updates this field, so the adduser program should set it up right
+**     initially (or a user could keep thier initial password forever ;)
+**     The number is in days since Jan 1st, 1970.
+**
+**                       Have fun with it, and someone please make
+**                       a real version(this is still just a hack)
+**                       for us all to use (and Email it to me???)
+**
+**                               Brandon
+**                                  photon@usis.com
+**
+***** 
+** adduser 1.0: add a new user account (For systems not using shadow)
+** With a nice little interface and a will to do all the work for you.
+**
+** Craig Hagan
+** hagan@opine.cs.umass.edu
+**
+** Modified to really work, look clean, and find unused uid by Chris Cappuccio
+** chris@slinky.cs.umass.edu
+**
+*****
+**
+** 01/19/95
+**
+** FURTHER modifications to enable shadow passwd support (kludged, but
+** no more so than the original)  by Dan Crowson - dcrowson@mo.net
+**
+** Search on DAN for all changes...
+**
+*****
+**
+** cc -O -o adduser adduser.c
+** Use gcc if you have it... (political reasons beyond my control) (chris)
+**
+** I've gotten this program to work with success under Linux (without
+** shadow) and SunOS 4.1.3. I would assume it should work pretty well
+** on any system that uses no shadow. (chris)
+**
+** If you have no crypt() then try
+** cc -DNO_CRYPT -O -o adduser adduser.c xfdes.c
+** I'm not sure how login operates with no crypt()... I guess
+** the same way we're doing it here.
+*/
+
+#include <pwd.h>
+#include <grp.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/timeb.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+#define DEFAULT_SHELL	"/bin/bash"  /* because BASH is your friend */
+#define DEFAULT_HOME	"/home"
+#define USERADD_PATH	"/usr/sbin/useradd"
+#define CHAGE_PATH	"/usr/sbin/chage"
+#define PASSWD_PATH	"/usr/bin/passwd"
+#define DEFAULT_GROUP	100
+
+#define DEFAULT_MAX_PASS 60
+#define DEFAULT_WARN_PASS 10
+/* if you use this feature, you will get a lot of complaints from users
+   who rarely use their accounts :)  (something like 3 months would be
+   more reasonable)  --marekm */
+#define DEFAULT_USER_DIE /* 10 */ 0
+
+void main()
+{
+	char foo[32];			
+	char uname[9],person[32],dir[32],shell[32];
+	unsigned int group,min_pass,max_pass,warn_pass,user_die;
+	/* the group and uid of the new user */
+	int bad=0,done=0,correct=0,gets_warning=0;
+	char cmd[255];
+	struct group *grp;
+	
+	/* flags, in order:
+	* bad to see if the username is in /etc/passwd, or if strange stuff has
+	* been typed if the user might be put in group 0
+	* done allows the program to exit when a user has been added
+	* correct loops until a password is found that isn't in /etc/passwd
+	* gets_warning allows the fflush to be skipped for the first gets
+	* so that output is still legible
+	*/
+
+	/* The real program starts HERE! */
+  
+	if(geteuid()!=0)
+	{
+		printf("It seems you don't have access to add a new user.  Try\n");
+		printf("logging in as root or su root to gain super-user access.\n");
+		exit(1);
+	}
+  
+	/* Sanity checks
+	*/
+	
+	if (!(grp=getgrgid(DEFAULT_GROUP))){
+		printf("Error: the default group %d does not exist on this system!\n",
+				DEFAULT_GROUP);
+		printf("adduser must be recompiled.\n");
+		exit(1);
+	}; 
+ 
+	while(!correct) {		/* loop until a "good" uname is chosen */
+		while(!done) {
+			printf("\nLogin to add (^C to quit): ");
+			if(gets_warning)	/* if the warning was already shown */
+				fflush(stdout);	/* fflush stdout, otherwise set the flag */
+			else
+				gets_warning=1;
+
+			gets(uname);
+			if(!strlen(uname)) {
+				printf("Empty input.\n");
+				done=0;
+				continue;
+			};
+
+			/* what I saw here before made me think maybe I was running DOS */
+			/* might this be a solution? (chris) */
+			if (getpwnam(uname) != NULL) {
+				printf("That name is in use, choose another.\n");
+				done=0;
+			} else
+				done=1;
+		}; /* done, we have a valid new user name */
+		
+		/* all set, get the rest of the stuff */
+		printf("\nEditing information for new user [%s]\n",uname);
+  
+		printf("\nFull Name [%s]: ",uname);
+		gets(person);
+		if (!strlen(person)) {
+			bzero(person,sizeof(person));
+			strcpy(person,uname);
+		};
+      
+		do {
+			bad=0; 
+			printf("GID [%d]: ",DEFAULT_GROUP);
+			gets(foo);
+			if (!strlen(foo))
+				group=DEFAULT_GROUP;
+			else
+				if (isdigit (*foo)) {
+					group = atoi(foo);
+					if (! (grp = getgrgid (group))) {
+						printf("unknown gid %s\n",foo);
+						group=DEFAULT_GROUP;
+						bad=1;
+					};
+			} else
+				if ((grp = getgrnam (foo)))
+					group = grp->gr_gid;
+				else {
+					printf("unknown group %s\n",foo);
+					group=DEFAULT_GROUP;
+					bad=1;
+				}
+			if (group==0){	/* You're not allowed to make root group users! */
+				printf("Creation of root group users not allowed (must be done by hand)\n");
+				group=DEFAULT_GROUP;
+				bad=1;
+			};
+		} while(bad);
+
+
+		fflush(stdin);
+      
+		printf("\nIf home dir ends with a / then [%s] will be appended to it\n",uname);
+		printf("Home Directory [%s/%s]: ",DEFAULT_HOME,uname);
+		fflush(stdout);
+		gets(dir);
+		if (!strlen(dir)) { /* hit return */
+			sprintf(dir,"%s/%s",DEFAULT_HOME,uname);
+			fflush(stdin);
+		} else
+			if (dir[strlen(dir)-1]=='/')
+				sprintf(dir,"%s%s",dir,uname);
+
+		printf("\nShell [%s]: ",DEFAULT_SHELL);
+		fflush(stdout);
+		gets(shell);
+		if (!strlen(shell))
+			sprintf(shell,"%s",DEFAULT_SHELL);
+      
+		printf("\nMin. Password Change Days [0]: ");
+		gets(foo);
+		min_pass=atoi(foo);
+            
+		printf("Max. Password Change Days [%d]: ",DEFAULT_MAX_PASS);
+		gets(foo);
+		if (strlen(foo) > 1)
+			max_pass = atoi(foo);
+		else
+			max_pass = DEFAULT_MAX_PASS;
+            
+		printf("Password Warning Days [%d]: ",DEFAULT_WARN_PASS);
+		gets(foo);
+		warn_pass = atoi(foo);
+		if (warn_pass==0)
+			warn_pass = DEFAULT_WARN_PASS;
+            
+		printf("Days after Password Expiry for Account Locking [%d]: ",DEFAULT_USER_DIE);
+		gets(foo);
+		user_die = atoi(foo);
+		if (user_die == 0)
+			user_die = DEFAULT_USER_DIE;
+      
+		printf("\nInformation for new user [%s] [%s]:\n",uname,person);
+		printf("Home directory: [%s] Shell: [%s]\n",dir,shell);
+		printf("GID: [%d]\n",group);
+		printf("MinPass: [%d] MaxPass: [%d] WarnPass: [%d] UserExpire: [%d]\n",
+				min_pass,max_pass,warn_pass,user_die);
+		printf("\nIs this correct? [y/N]: ");
+		fflush(stdout);
+		gets(foo);
+
+		done=bad=correct=(foo[0]=='y'||foo[0]=='Y');
+
+		if(bad!=1)
+			printf("\nUser [%s] not added\n",uname);
+    }
+
+	bzero(cmd,sizeof(cmd));
+	sprintf(cmd,"%s -g %d -d %s -s %s -c \"%s\" -m -k /etc/skel %s",
+			USERADD_PATH,group,dir,shell,person,uname);
+	printf("Calling useradd to add new user:\n%s\n",cmd);  
+	if(system(cmd)){
+		printf("User add failed!\n");
+		exit(errno);
+	};
+	bzero(cmd,sizeof(cmd));
+	sprintf(cmd,"%s -m %d -M %d -W %d -I %d %s", CHAGE_PATH,
+			min_pass,max_pass,warn_pass,user_die,uname);
+	printf("%s\n",cmd);
+	if(system(cmd)){
+		printf("There was an error setting password expire values\n");
+		exit(errno);
+	};
+	bzero(cmd,sizeof(cmd));
+	sprintf(cmd,"%s %s",PASSWD_PATH,uname);
+	system(cmd);
+	printf("\nDone.\n");
+}
+
--- a/contrib/adduser.c
+++ b/contrib/adduser.c
@@ -34,7 +34,7 @@
 ** 1/28/95
 ** shadow-adduser 1.3:
 ** 
-** Basically a bug-fix on my additions in 1.2.  Thanks to Terry Stewart 
+** Basically a bug-fix on my additions in 1.2.  Thanx to Terry Stewart 
 ** (stew@texas.net) for pointing out one of the many idiotic bugs I introduced.
 ** It was such a stupid bug that I would have never seen it myself.
 **
@@ -60,7 +60,7 @@
 ** Added in the password date field, which should always reflect the last
 **     date the password was changed, for expiry purposes.  "passwd" always
 **     updates this field, so the adduser program should set it up right
-**     initially (or a user could keep their initial password forever ;)
+**     initially (or a user could keep thier initial password forever ;)
 **     The number is in days since Jan 1st, 1970.
 **
 **                       Have fun with it, and someone please make
@@ -296,7 +296,7 @@ main (void)
 	      sprintf (dir, "%s/%s", DEFAULT_HOME, usrname);
 	    }
 	  else if (dir[strlen (dir) - 1] == '/')
-	    sprintf (dir+strlen(dir), "%s", usrname);
+	    sprintf (dir, "%s%s", dir, usrname);
 	}
      else
 	{
@@ -489,7 +489,7 @@ safeget (char *buf, int maxlen)
  while ((c = getc (stdin)) != EOF && (c != '\n') && (++i < maxlen))
    {
      bad = (!isalnum (c) && (c != '_') && (c != ' '));
-      *(buf++) = c;
+      *(buf++) = (char) c;
    }
  *buf = '\0';

--- a/contrib/adduser2.sh
+++ b/contrib/adduser2.sh
@@ -32,7 +32,7 @@ def_home_dir=/home/users
 # default shell
 def_shell=/bin/tcsh

-# Default expiration date (mm/dd/yy)
+# Defaul expiration date (mm/dd/yy)
 def_expire=""

 # default dates
--- a/contrib/atudel
+++ b/contrib/atudel
@@ -1,7 +1,34 @@
 #!/usr/bin/perl
 #
-# SPDX-FileCopyrightText: 1996 Brian R. Gaeke
-# SPDX-License-Identifier: BSD-4-Clause
+# Copyright (c) 1996 Brian R. Gaeke
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#    This product includes software developed by Brian R. Gaeke.
+# 4. The name of the author, Brian R. Gaeke, may not be used to endorse
+#    or promote products derived from this software without specific
+#    prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY BRIAN R. GAEKE ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED.  IN NO EVENT SHALL BRIAN R. GAEKE BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
 #
 # Additionally:
 #
--- a/contrib/groupmems.shar
+++ b/contrib/groupmems.shar
@@ -76,9 +76,36 @@ else
  $echo 'x -' extracting 'Makefile' '(text)'
  sed 's/^X//' << 'SHAR_EOF' > 'Makefile' &&
 /*
-# SPDX-FileCopyrightText: 2000, International Business Machines, Inc.
-# SPDX-FileCopyrightText: 2000, George Kraft IV, gk4@us.ibm.com
-# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2000, International Business Machines, Inc.
+# All rights reserved.
+#
+# original author: George Kraft IV, gk4@us.ibm.com
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of International Business Machines, Inc., nor the 
+#    names of its contributors may be used to endorse or promote products 
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY INTERNATIONAL BUSINESS MACHINES, INC. AND
+# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL 
+# INTERNATIONAL BUSINESS MACHINES, INC. OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
 # 
 X
 all: groupmems
@@ -116,9 +143,36 @@ else
  $echo 'x -' extracting 'groupmems.c' '(text)'
  sed 's/^X//' << 'SHAR_EOF' > 'groupmems.c' &&
 /*
-X * SPDX-FileCopyrightText: 2000, International Business Machines, Inc.
-X * SPDX-FileCopyrightText: 2000, George Kraft IV, gk4@us.ibm.com
-X * SPDX-License-Identifier: BSD-3-Clause
+X * Copyright 2000, International Business Machines, Inc.
+X * All rights reserved.
+X *
+X * original author: George Kraft IV, gk4@us.ibm.com
+X *
+X * Redistribution and use in source and binary forms, with or without
+X * modification, are permitted provided that the following conditions
+X * are met:
+X *
+X * 1. Redistributions of source code must retain the above copyright
+X *    notice, this list of conditions and the following disclaimer.
+X * 2. Redistributions in binary form must reproduce the above copyright
+X *    notice, this list of conditions and the following disclaimer in the
+X *    documentation and/or other materials provided with the distribution.
+X * 3. Neither the name of International Business Machines, Inc., nor the 
+X *    names of its contributors may be used to endorse or promote products 
+X *    derived from this software without specific prior written permission.
+X *
+X * THIS SOFTWARE IS PROVIDED BY INTERNATIONAL BUSINESS MACHINES, INC. AND
+X * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+X * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+X * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL 
+X * INTERNATIONAL BUSINESS MACHINES, INC. OR CONTRIBUTORS BE LIABLE
+X * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+X * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+X * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+X * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+X * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+X * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+X * SUCH DAMAGE.
 X */
 /*
 **
@@ -382,9 +436,36 @@ else
  $echo 'x -' extracting 'groupmems.8' '(text)'
  sed 's/^X//' << 'SHAR_EOF' > 'groupmems.8' &&
 X.\"
-X.\" SPDX-FileCopyrightText: 2000, International Business Machines, Inc.
-X.\" SPDX-FileCopyrightText: 2000, George Kraft IV, gk4@us.ibm.com
-X.\" SPDX-License-Identifier: BSD-3-Clause
+X.\" Copyright 2000, International Business Machines, Inc.
+X.\" All rights reserved.
+X.\"
+X.\" original author: George Kraft IV, gk4@us.ibm.com
+X.\"
+X.\" Redistribution and use in source and binary forms, with or without
+X.\" modification, are permitted provided that the following conditions
+X.\" are met:
+X.\"
+X.\" 1. Redistributions of source code must retain the above copyright
+X.\"    notice, this list of conditions and the following disclaimer.
+X.\" 2. Redistributions in binary form must reproduce the above copyright
+X.\"    notice, this list of conditions and the following disclaimer in the
+X.\"    documentation and/or other materials provided with the distribution.
+X.\" 3. Neither the name of International Business Machines, Inc., nor the 
+X.\"    names of its contributors may be used to endorse or promote products 
+X.\"    derived from this software without specific prior written permission.
+X.\"
+X.\" THIS SOFTWARE IS PROVIDED BY INTERNATIONAL BUSINESS MACHINES, INC. AND
+X.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+X.\" BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+X.\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL 
+X.\" INTERNATIONAL BUSINESS MACHINES, INC. OR CONTRIBUTORS BE LIABLE
+X.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+X.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+X.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+X.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+X.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+X.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+X.\" SUCH DAMAGE.
 X.\"
 X.\" $Id$
 X.\"
@@ -399,7 +480,7 @@ X.B groupmems
 \fB-D\fR |
 [\fB-g\fI group_name \fR]
 X.SH DESCRIPTION
-The \fBgroupmems\fR utility allows a user to administer their own
+The \fBgroupmems\fR utility allows a user to administer his/her own
 group membership list without the requirement of superuser privileges.
 The \fBgroupmems\fR utility is for systems that configure its users to
 be in their own name sake primary group (i.e., guest / guest).
--- a/contrib/pwdauth.c
+++ b/contrib/pwdauth.c
@@ -0,0 +1,308 @@
+/*
+ * pwdauth.c - program to verify a given username/password pair.
+ *
+ * Run it with username in argv[1] (may be omitted - default is the
+ * current user), and send it the password over a pipe on stdin.
+ * Exit status: 0 - correct password, 1 - wrong password, >1 - other
+ * errors.  For use with shadow passwords, this program should be
+ * installed setuid root.
+ *
+ * This can be used, for example, by xlock - you don't have to install
+ * this large and complex (== possibly insecure) program setuid root,
+ * just modify it to run this simple program to do the authentication.
+ *
+ * Recent versions (xlockmore-3.9) are cleaner, and drop privileges as
+ * soon as possible after getting the user's encrypted password.
+ * Using this program probably doesn't make it more secure, and has one
+ * disadvantage: since we don't get the encrypted user's password at
+ * startup (but at the time the user is authenticated), it is not clear
+ * how we should handle errors (like getpwnam() returning NULL).
+ * - fail the authentication?  Problem: no way to unlock (other than kill
+ *   the process from somewhere else) if the NIS server stops responding.
+ * - succeed and unlock?  Problem: it's too easy to unlock by unplugging
+ *   the box from the network and waiting until NIS times out...
+ *
+ * This program is Copyright (C) 1996 Marek Michalkiewicz
+ * <marekm@i17linuxb.ists.pwr.wroc.pl>.
+ *
+ * It may be used and distributed freely for any purposes.  There is no
+ * warranty - use at your own risk.  I am not liable for any damages etc.
+ * If you improve it, please send me your changes.
+ */
+
+static char rcsid[] = "$Id$";
+
+/*
+ * Define USE_SYSLOG to use syslog() to log successful and failed
+ * authentication.  This should be safe even if your system has
+ * the infamous syslog buffer overrun security problem...
+ */
+#define USE_SYSLOG
+
+/*
+ * Define HAVE_GETSPNAM to get shadow passwords using getspnam().
+ * Some systems don't have getspnam(), but getpwnam() returns
+ * encrypted passwords only if running as root.
+ *
+ * According to the xlock source (not tested, except Linux) -
+ * define: Linux, Solaris 2.x, SVR4, ...
+ * undef: HP-UX with Secured Passwords, FreeBSD, NetBSD, QNX.
+ * Known not supported (yet): Ultrix, OSF/1, SCO.
+ */
+#define HAVE_GETSPNAM
+
+/*
+ * Define HAVE_PW_ENCRYPT to use pw_encrypt() instead of crypt().
+ * pw_encrypt() is like the standard crypt(), except that it may
+ * support better password hashing algorithms.
+ *
+ * Define if linking with libshadow.a from the shadow password
+ * suite (Linux, SunOS 4.x?).
+ */
+#undef HAVE_PW_ENCRYPT
+
+/*
+ * Define HAVE_AUTH_METHODS to support the shadow suite specific
+ * extension: the encrypted password field contains a list of
+ * administrator defined authentication methods, separated by
+ * semicolons.  This program only supports the standard password
+ * authentication method (a string that doesn't start with '@').
+ */
+#undef HAVE_AUTH_METHODS
+
+/*
+ * FAIL_DELAY - number of seconds to sleep before exiting if the
+ * password was wrong, to slow down password guessing attempts.
+ */
+#define FAIL_DELAY 2
+
+/* No user-serviceable parts below :-).  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <pwd.h>
+
+#ifdef USE_SYSLOG
+#include <syslog.h>
+#ifndef LOG_AUTHPRIV
+#define LOG_AUTHPRIV LOG_AUTH
+#endif
+#endif
+
+#ifdef HAVE_GETSPNAM
+#include <shadow.h>
+#endif
+
+#ifdef HAVE_PW_ENCRYPT
+extern char *pw_encrypt();
+#define crypt pw_encrypt
+#endif
+
+/*
+ * Read the password (one line) from fp.  We don't turn off echo
+ * because we expect input from a pipe.
+ */
+static char *
+get_line(fp)
+	FILE *fp;
+{
+	static char buf[128];
+	char *cp;
+	int ch;
+
+	cp = buf;
+	while ((ch = getc(fp)) != EOF && ch != '\0' && ch != '\n') {
+		if (cp >= buf + sizeof buf - 1)
+			break;
+		*cp++ = ch;
+	}
+	*cp = '\0';
+	return buf;
+}
+
+/*
+ * Get the password file entry for the current user.  If the name
+ * returned by getlogin() is correct (matches the current real uid),
+ * return the entry for that user.  Otherwise, return the entry (if
+ * any) matching the current real uid.  Return NULL on failure.
+ */
+static struct passwd *
+get_my_pwent()
+{
+	uid_t uid = getuid();
+	char *name = getlogin();
+
+	if (name && *name) {
+		struct passwd *pw = getpwnam(name);
+
+		if (pw && pw->pw_uid == uid)
+			return pw;
+	}
+	return getpwuid(uid);
+}
+
+/*
+ * Verify the password.  The system-dependent shadow support is here.
+ */
+static int
+password_auth_ok(pw, pass)
+	const struct passwd *pw;
+	const char *pass;
+{
+	int result;
+	char *cp;
+#ifdef HAVE_AUTH_METHODS
+	char *buf;
+#endif
+#ifdef HAVE_GETSPNAM
+	struct spwd *sp;
+#endif
+
+	if (pw) {
+#ifdef HAVE_GETSPNAM
+		sp = getspnam(pw->pw_name);
+		if (sp)
+			cp = sp->sp_pwdp;
+		else
+#endif
+			cp = pw->pw_passwd;
+	} else
+		cp = "xx";
+
+#ifdef HAVE_AUTH_METHODS
+	buf = strdup(cp);  /* will be modified by strtok() */
+	if (!buf) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(13);
+	}
+	cp = strtok(buf, ";");
+	while (cp && *cp == '@')
+		cp = strtok(NULL, ";");
+
+	/* fail if no password authentication for this user */
+	if (!cp)
+		cp = "xx";
+#endif
+
+	if (*pass || *cp)
+		result = (strcmp(crypt(pass, cp), cp) == 0);
+	else
+		result = 1;  /* user with no password */
+
+#ifdef HAVE_AUTH_METHODS
+	free(buf);
+#endif
+	return result;
+}
+
+/*
+ * Main program.
+ */
+int
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	struct passwd *pw;
+	char *pass, *name;
+	char myname[32];
+
+#ifdef USE_SYSLOG
+	openlog("pwdauth", LOG_PID | LOG_CONS, LOG_AUTHPRIV);
+#endif
+	pw = get_my_pwent();
+	if (!pw) {
+#ifdef USE_SYSLOG
+		syslog(LOG_ERR, "can't get login name for uid %d.\n",
+		       (int) getuid());
+#endif
+		fprintf(stderr, "Who are you?\n");
+		exit(2);
+	}
+	strncpy(myname, pw->pw_name, sizeof myname - 1);
+	myname[sizeof myname - 1] = '\0';
+	name = myname;
+
+	if (argc > 1) {
+		name = argv[1];
+		pw = getpwnam(name);
+	}
+
+	pass = get_line(stdin);
+	if (password_auth_ok(pw, pass)) {
+#ifdef USE_SYSLOG
+		syslog(pw->pw_uid ? LOG_INFO : LOG_NOTICE,
+		       "user `%s' entered correct password for `%.32s'.\n",
+		       myname, name);
+#endif
+		exit(0);
+	}
+#ifdef USE_SYSLOG
+	/* be careful not to overrun the syslog buffer */
+	syslog((!pw || pw->pw_uid) ? LOG_NOTICE : LOG_WARNING,
+	       "user `%s' entered incorrect password for `%.32s'.\n",
+	       myname, name);
+#endif
+#ifdef FAIL_DELAY
+	sleep(FAIL_DELAY);
+#endif
+	fprintf(stderr, "Wrong password.\n");
+	exit(1);
+}
+
+#if 0
+/*
+ * You can use code similar to the following to run this program.
+ * Return values: >=0 - program exit status (use the <sys/wait.h>
+ * macros to get the exit code, it is shifted left by 8 bits),
+ * -1 - check errno.
+ */
+int
+verify_password(const char *username, const char *password)
+{
+	int pipe_fd[2];
+	int pid, wpid, status;
+
+	if (pipe(pipe_fd))
+		return -1;
+	
+	if ((pid = fork()) == 0) {
+		char *arg[3];
+		char *env[1];
+
+		/* child */
+		close(pipe_fd[1]);
+		if (pipe_fd[0] != 0) {
+			if (dup2(pipe_fd[0], 0) != 0)
+				_exit(127);
+			close(pipe_fd[0]);
+		}
+		arg[0] = "/usr/bin/pwdauth";
+		arg[1] = username;
+		arg[2] = NULL;
+		env[0] = NULL;
+		execve(arg[0], arg, env);
+		_exit(127);
+	} else if (pid == -1) {
+		/* error */
+		close(pipe_fd[0]);
+		close(pipe_fd[1]);
+		return -1;
+	}
+	/* parent */
+	close(pipe_fd[0]);
+	write(pipe_fd[1], password, strlen(password));
+	write(pipe_fd[1], "\n", 1);
+	close(pipe_fd[1]);
+
+	while ((wpid = wait(&status)) != pid) {
+		if (wpid == -1)
+			return -1;
+	}
+	return status;
+}
+#endif
--- a/contrib/shadow-anonftp.patch
+++ b/contrib/shadow-anonftp.patch
@@ -2,7 +2,7 @@ Hello Marek,

 I have created a diffile against the 980403 release that adds
 functionality to newusers for automatic handling of users with only
-anonymous ftp login (using the guestgroup feature in ftpaccess, which
+anonomous ftp login (using the guestgroup feature in ftpaccess, which
 means that the users home directory looks like '/home/user/./'). It also
 adds a commandline argument to specify an initial directory structure
 for such users, with a tarball normally containing the bin,lib,etc
--- a/doc/HOWTO
+++ b/doc/HOWTO
@@ -1311,7 +1311,7 @@

  This means that fred's password is valid, it was last changed on
  03/04/96, it can be changed at any time, it expires after 60 days,
-  fred will not be warned, and the account won't be disabled when
+  fred will not be warned, and and the account won't be disabled when
  the password expires.

  This simply means that if fred logs in after the password expires, he
@@ -1487,7 +1487,7 @@

  If a user logs into a line that is listed in /etc/dialups, and his
  shell is listed in the file /etc/d_passwd he will be allowed access
-  only by supplying the correct password.
+  only by suppling the correct password.

  Another useful purpose for using dial-up passwords might be to setup a
  line that only allows a certain type of connect (perhaps a PPP or UUCP
--- a/doc/README.limits
+++ b/doc/README.limits
@@ -15,7 +15,7 @@ Changes:
 		- code merged into lmain.c --cristiang

 TODO:	- support groups in the limits file
-	  (only usernames are supported at this moment :-( )
+	  (only usernames are supported at this momment :-( )

 Setting user limits for shadow login program

@@ -63,3 +63,4 @@ To completely disable limits for a user, a single dash (-) will do.
 Also, please note that all limit settings are set PER LOGIN.  They are
 not global, nor are they permanent.  Perhaps global limits will come, but
 for now this will have to do ;)
+
--- a/doc/README.platforms
+++ b/doc/README.platforms
@@ -3,7 +3,7 @@
 # This is the current (still incomplete) list of platforms this
 # package has been verified to work on.  Additions (preferably
 # in the format as described below) are welcome.  Thanks!
-#
+# 
 # V: last version reported to work
 # H: host type
 # L: Linux libc version
--- a/doc/README.skey
+++ b/doc/README.skey
@@ -1,4 +0,0 @@
-# S/Key support
-shadow-utils can be built with S/Key support using the S/Key package from:
-* http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libskey/ or
-* https://gentoo.osuosl.org/distfiles/skey-1.1.5.tar.bz2
--- a/doc/WISHLIST
+++ b/doc/WISHLIST
@@ -26,13 +26,17 @@ New ideas to add to this list are welcome, too.  --marekm
 - vipw: check password files for errors after editing
 - add "maximum time users allowed to stay logged in" limit option to logoutd
 - handle quotes in /etc/environment like the shell does (but sshd doesn't...)
+- better utmpx support (logoutd, ...)
 - better OPIE support (report number of logins left, etc.)
 - new option for /etc/suauth: don't load user's environment (force "su -")
  suggested by Ulisses Alonso Camaro
 - find out why recent releases won't compile on Solaris
+- newusers UID/GID selection algorithm should be the same as useradd
+  (and use UID_MIN, UID_MAX from login.defs)
 - newusers should be able to copy /etc/skel to the new home directory
  (like useradd)
 - add directories where other packages can add hooks for package-specific
  per-user configuration, to be executed with run-parts. Some hooks should
  be executed at package install time for existing users, likewise for
  package removal and possibly modification.  (Debian Bug#36019)
+
--- a/doc/contributions/build_install.md
+++ b/doc/contributions/build_install.md
@@ -1,73 +0,0 @@
-# Build & install
-
-The following page explains how to build and install the shadow project.
-Additional information on how to do this in a container environment is provided
-at the end of the page.
-
-## Local
-
-### Dependency installation
-
-This projects depends on other software packages that need to be installed
-before building it. We recommend using the dependency installation commands
-provided by the distributions to install them. Some examples below.
-
-Debian:
-```
-apt-get build-dep shadow
-```
-
-Fedora:
-```
-dnf builddep shadow-utils
-```
-
-An alternative would be to take a look at the CI workflow [file](../../.github/workflows/runner.yml)
-and get the package names from there. This has the advantage that it
-also includes new dependencies needed for the development version
-which might have not been present in the last release.
-
-### Configure
-
-The first step is to configure it. You can use the
-`autogen.sh` script provided by the project. Example:
-
-```
-./autogen.sh --without-selinux --enable-man --with-yescrypt
-```
-
-### Build
-
-The next step is to build the project:
-
-```
-make -j4
-```
-
-### Install
-
-The last step is to install it. We recommend avoiding this step and using a
-disposable system like a VM or a container instead.
-
-```
-make install
-```
-
-## Containers
-
-Alternatively, you can use any of the preconfigured container images builders
-to build and install shadow.
-
-You can either generate a single image by running the following command from
-the root folder of the project (i.e. Alpine):
-
-```
-docker build -f share/containers/alpine.dockerfile . --output build-out/alpine
-```
-
-Or generate all of the images with the `container-build.sh` script, as if you
-were running some of the CI checks locally:
-
-```
-share/container-build.sh
-```
--- a/doc/contributions/ci.md
+++ b/doc/contributions/ci.md
@@ -1,25 +0,0 @@
-# Continuous Integration (CI)
-
-Shadow runs a CI workflow every time a pull-request (PR) is updated. This
-workflow contains several checks to assure the quality of the project, and
-only pull-requests with green results are merged.
-
-## Build & install
-
-The project is built & installed on Ubuntu, Alpine, Debian and Fedora. The last
-three distributions are built & installed on containers, and the workflow can
-be triggered locally by following the instructions specified in the
-[Build & install](build_install.md#containers) page.
-
-## System tests
-
-The project is tested on Ubuntu. For that purpose it is built & installed in
-this distribution in a VM. You can run this step locally by following the
-instructions provided in the [Tests](tests.md#system-tests) page.
-
-## Static code analysis
-
-C and shell static code analysis is also executed. For that purpose
-[CodeQL](https://codeql.github.com/) and
-[Differential ShellCheck](https://github.com/marketplace/actions/differential-shellcheck)
-are used.
--- a/doc/contributions/coding_style.md
+++ b/doc/contributions/coding_style.md
@@ -1,12 +0,0 @@
-# Coding style
-
-* For a general guidance refer to the
-[Linux kernel coding style](https://www.kernel.org/doc/html/latest/process/coding-style.html)
-
-* Patches that change the existing coding style are not welcome, as they make
-downstream porting harder for the distributions
-
-## Indentation
-
-Tabs are preferred over spaces for indentation. Loading the `.editorconfig`
-file in your preferred IDE may help you configure it.
--- a/doc/contributions/introduction.md
+++ b/doc/contributions/introduction.md
@@ -1,77 +0,0 @@
-# Introduction
-
-## Git and Github
-
-We recommend you to get familiar with the
-[git](https://guides.github.com/introduction/git-handbook) and
-[Github](https://guides.github.com) workflows before posting any changes.
-
-### Set up in a nut shell
-
-The following steps describe the process in a nut shell to provide you a basic
-template:
-
-* Create an account on [GitHub](https://github.com)
-* Fork the [shadow repository](https://github.com/shadow-maint/shadow)
-* Clone the shadow repository
-
-```
-git clone https://github.com/shadow-maint/shadow.git
-```
-
-* Add your fork as an extra remote
-
-```
-git remote add $ghusername git@github.com:$ghusername/shadow.git
-```
-
-* Setup your name contact e-mail that you want to use for the development
-
-```
-git config user.name "John Smith"
-git config user.email "john.smith@home.com"
-```
-
-**Note**: this will setup the user information only for this repository. You
-can also add `--global` switch to the `git config` command to setup these
-options globally and thus making them available in every git repository.
-
-* Create a working branch
-
-```
-git checkout -b my-changes
-```
-
-* Commit changes
-
-```
-vim change-what-you-need
-git commit -s
-```
-
-Check
-[the kernel patches guide](https://www.kernel.org/doc/html/v4.14/process/submitting-patches.html#describe-your-changes)
-to get an idea on how to write a good commit message.
-
-* Push your changes to your GitHub repository
-
-```
-git push $ghusername my-changes --force
-```
-
-* Open a Pull Request against shadow project by clicking on the link provided
-in the output of the previous step
-
-* Make sure that all Continuous Integration checks are green and wait review
-
-## Internal guidelines
-
-Additionally, you should also check the following internal guidelines to
-understand the project's development model:
-
-* [Build & install](build_install.md)
-* [Coding style](coding_style.md)
-* [Tests](tests.md)
-* [Continuous Integration](CI.md)
-* [Releases](releases.md)
-* [License](license.md)
--- a/doc/contributions/license.md
+++ b/doc/contributions/license.md
@@ -1,10 +0,0 @@
-# License
-
-All new source code committed to the shadow project is assumed to be made
-available under the [BSD-3-Clause](../../COPYING) license unless the submitter
-specifies another license at that time. The shadow maintainers reserve the
-right to refuse a submission if the license is deemed incompatible with the
-goals of the project.
-
-**Note**: old code may be made available under another license, check the
-license tag for each file to get additional information.
--- a/doc/contributions/releases.md
+++ b/doc/contributions/releases.md
@@ -1,7 +0,0 @@
-# Releases
-
-The shadow project doesn't follow any specific timeline to release new software
-versions. Usually, they are released when a major milestone is finished.
-
-Released source code, alongside the release notes, are provided in the
-[release Github page](https://github.com/shadow-maint/shadow/releases).
--- a/doc/contributions/tests.md
+++ b/doc/contributions/tests.md
@@ -1,18 +0,0 @@
-# Tests
-
-Currently, shadow only provides system tests.
-
-## System tests
-
-These type of tests are written in shell. Unfortunately, the testing framework
-is tightly coupled to the Ubuntu distribution and it can only be run in this
-distribution. Besides, if anything fails during the execution the system can
-be left in an unstable state. Taking that into account you shouldn't run this
-workflow in your host machine, we recommend to use a disposable system like a
-VM or a container instead.
-
-You can execute system tests by running:
-
-```
-cd tests && ./run_all`.
-```
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,15 +0,0 @@
-<head>
-<title>shadow - Welcome</title>
-</head>
-<body>
-<h2> Welcome!</h2>
-<p> This is the shadow tool suite home page. </p>
-
-<p>
-You can find releases <a href="https://github.com/shadow-maint/shadow/releases">here</a>.
-</p>
-
-<p>
-Raise issues, request features, and report bugs <a href="https://github.com/shadow-maint/shadow/issues">here</a>.
-</p>
-</body>
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -4,7 +4,8 @@
 sysconf_DATA = login.defs

 defaultdir = $(sysconfdir)/default
-default_DATA =
+default_DATA = \
+	useradd

 nonpam_files = \
 	limits \
--- a/etc/login.access
+++ b/etc/login.access
@@ -1,20 +1,20 @@
 # $Id$
 #
 # Login access control table.
-#
+# 
 # When someone logs in, the table is scanned for the first entry that
 # matches the (user, host) combination, or, in case of non-networked
 # logins, the first entry that matches the (user, tty) combination.  The
-# permissions field of that table entry determines whether the login will
+# permissions field of that table entry determines whether the login will 
 # be accepted or refused.
-#
+# 
 # Format of the login access control table is three fields separated by a
 # ":" character:
-#
+# 
 # 	permission : users : origins
-#
+# 
 # The first field should be a "+" (access granted) or "-" (access denied)
-# character.
+# character. 
 #
 # The second field should be a list of one or more login names, group
 # names, or ALL (always matches). A pattern of the form user@host is
@@ -37,7 +37,7 @@
 # listed: the program does not look at a user's primary group id value.
 #
 ##############################################################################
-#
+# 
 # Disallow console logins to all but a few accounts.
 #
 #-:ALL EXCEPT wheel shutdown sync:console
--- a/etc/login.defs
+++ b/etc/login.defs
@@ -6,18 +6,16 @@

 #
 # 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.
-#       pam_unix(8) enforces a 2s delay)
 #
 FAIL_DELAY		3

 #
-# Enable logging and display of /var/log/faillog login(1) failure info.
+# Enable logging and display of /var/log/faillog login failure info.
 #
 FAILLOG_ENAB		yes

 #
-# Enable display of unknown usernames when login(1) failures are recorded.
+# Enable display of unknown usernames when login failures are recorded.
 #
 LOG_UNKFAIL_ENAB	no

@@ -27,19 +25,10 @@ LOG_UNKFAIL_ENAB	no
 LOG_OK_LOGINS		no

 #
-# Enable logging and display of /var/log/lastlog login(1) time info.
+# Enable logging and display of /var/log/lastlog login time info.
 #
 LASTLOG_ENAB		yes

-#
-# Limit the highest user ID number for which the lastlog entries should
-# be updated.
-#
-# No LASTLOG_UID_MAX means that there is no user ID limit for writing
-# lastlog entries.
-#
-#LASTLOG_UID_MAX
-
 #
 # Enable checking and display of mailbox status upon login.
 #
@@ -59,13 +48,13 @@ OBSCURE_CHECKS_ENAB	yes
 PORTTIME_CHECKS_ENAB	yes

 #
-# Enable setting of ulimit, umask, and niceness from passwd(5) gecos field.
+# Enable setting of ulimit, umask, and niceness from passwd gecos field.
 #
 QUOTAS_ENAB		yes

 #
-# Enable "syslog" logging of su(1) activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp(1) and sg(1).
+# Enable "syslog" logging of su activity - in addition to sulog file logging.
+# SYSLOG_SG_ENAB does the same for newgrp and sg.
 #
 SYSLOG_SU_ENAB		yes
 SYSLOG_SG_ENAB		yes
@@ -73,13 +62,13 @@ SYSLOG_SG_ENAB		yes
 #
 # If defined, either full pathname of a file containing device names or
 # a ":" delimited list of device names.  Root logins will be allowed only
-# from these devices.
+# upon these devices.
 #
 CONSOLE		/etc/securetty
 #CONSOLE	console:tty01:tty02:tty03:tty04

 #
-# If defined, all su(1) activity is logged to this file.
+# If defined, all su activity is logged to this file.
 #
 #SULOG_FILE	/var/log/sulog

@@ -91,33 +80,33 @@ MOTD_FILE	/etc/motd
 #MOTD_FILE	/etc/motd:/usr/lib/news/news-motd

 #
-# If defined, this file will be output before each login(1) prompt.
+# If defined, this file will be output before each login prompt.
 #
 #ISSUE_FILE	/etc/issue

 #
 # If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format similar to "vt100  tty01".
+# Each line of the file is in a format something like "vt100  tty01".
 #
 #TTYTYPE_FILE	/etc/ttytype

 #
-# If defined, login(1) failures will be logged here in a utmp format.
-# last(1), when invoked as lastb(1), will read /var/log/btmp, so...
+# If defined, login failures will be logged here in a utmp format.
+# last, when invoked as lastb, will read /var/log/btmp, so...
 #
 FTMP_FILE	/var/log/btmp

 #
-# If defined, name of file whose presence will inhibit non-root
-# logins.  The content of this file should be a message indicating
+# If defined, name of file whose presence which will inhibit non-root
+# logins.  The contents of this file should be a message indicating
 # why logins are inhibited.
 #
 NOLOGINS_FILE	/etc/nologin

 #
 # If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then ps(1) will display the
-# command as "-su".  If not defined, then ps(1) will display the
+# example, if this is defined as "su" then a "ps" will display the
+# command is "-su".  If not defined, then "ps" would display the
 # name of the shell actually being run, e.g. something like "-sh".
 #
 SU_NAME		su
@@ -167,10 +156,10 @@ ENV_PATH	PATH=/bin:/usr/bin
 #	TTYGROUP	Login tty will be assigned this group ownership.
 #	TTYPERM		Login tty will be set to this permission.
 #
-# If you have a write(1) program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP as the number of such group
-# and TTYPERM as 0620.  Otherwise leave TTYGROUP commented out and
-# set TTYPERM to either 622 or 600.
+# If you have a "write" program which is "setgid" to a special group
+# which owns the terminals, define TTYGROUP to the group number and
+# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
+# TTYPERM to either 622 or 600.
 #
 TTYGROUP	tty
 TTYPERM		0600
@@ -180,6 +169,7 @@ TTYPERM		0600
 #
 #	ERASECHAR	Terminal ERASE character ('\010' = backspace).
 #	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
+#	UMASK		Default "umask" value.
 #	ULIMIT		Default "ulimit" value.
 #
 # The ERASECHAR and KILLCHAR are used only on System V machines.
@@ -190,21 +180,8 @@ TTYPERM		0600
 #
 ERASECHAR	0177
 KILLCHAR	025
-#ULIMIT		2097152
-
-# Default initial "umask" value used by login(1) on non-PAM enabled systems.
-# Default "umask" value for pam_umask(8) on PAM enabled systems.
-# UMASK is also used by useradd(8) and newusers(8) to set the mode for new
-# home directories if HOME_MODE is not set.
-# 022 is the default value, but 027, or even 077, could be considered
-# for increased privacy. There is no One True Answer here: each sysadmin
-# must make up their mind.
 UMASK		022
-
-# HOME_MODE is used by useradd(8) and newusers(8) to set the mode for new
-# home directories.
-# If HOME_MODE is not set, the value of UMASK is used to create the mode.
-#HOME_MODE	0700
+#ULIMIT		2097152

 #
 # Password aging controls:
@@ -228,43 +205,35 @@ PASS_WARN_AGE	7
 SU_WHEEL_ONLY	no

 #
-# If compiled with cracklib support, sets the path to the dictionaries
+# If compiled with cracklib support, where are the dictionaries
 #
 CRACKLIB_DICTPATH	/var/cache/cracklib/cracklib_dict

 #
-# Min/max values for automatic uid selection in useradd(8)
+# Min/max values for automatic uid selection in useradd
 #
 UID_MIN			 1000
 UID_MAX			60000
 # System accounts
-SYS_UID_MIN		  101
+SYS_UID_MIN		  100
 SYS_UID_MAX		  999
-# Extra per user uids
-SUB_UID_MIN		   100000
-SUB_UID_MAX		600100000
-SUB_UID_COUNT		    65536

 #
-# Min/max values for automatic gid selection in groupadd(8)
+# Min/max values for automatic gid selection in groupadd
 #
 GID_MIN			 1000
 GID_MAX			60000
 # System accounts
-SYS_GID_MIN		  101
+SYS_GID_MIN		  100
 SYS_GID_MAX		  999
-# Extra per user group ids
-SUB_GID_MIN		   100000
-SUB_GID_MAX		600100000
-SUB_GID_COUNT		    65536

 #
-# Max number of login(1) retries if password is bad
+# Max number of login retries if password is bad
 #
 LOGIN_RETRIES		5

 #
-# Max time in seconds for login(1)
+# Max time in seconds for login
 #
 LOGIN_TIMEOUT		60

@@ -286,16 +255,16 @@ PASS_ALWAYS_WARN	yes
 #PASS_MAX_LEN		8

 #
-# Require password before chfn(1)/chsh(1) can make any changes.
+# Require password before chfn/chsh can make any changes.
 #
 CHFN_AUTH		yes

 #
-# Which fields may be changed by regular users using chfn(1) - use
+# Which fields may be changed by regular users using chfn - use
 # any combination of letters "frwh" (full name, room number, work
 # phone, home phone).  If not defined, no changes are allowed.
 # For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-#
+# 
 CHFN_RESTRICT		rwh

 #
@@ -316,19 +285,16 @@ CHFN_RESTRICT		rwh
 # 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.
+# This variable is deprecated. You should use ENCRYPT_METHOD.
 #
 #MD5_CRYPT_ENAB	no

 #
 # Only works if compiled with ENCRYPTMETHOD_SELECT defined:
-# If set to MD5, MD5-based algorithm will be used for encrypting password
+# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
-# If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password
-# If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password
 # If set to DES, DES-based algorithm will be used for encrypting password (default)
-# 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
@@ -340,72 +306,35 @@ CHFN_RESTRICT		rwh
 # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
 #
 # Define the number of SHA rounds.
-# With a lot of rounds, it is more difficult to brute-force the password.
-# However, more CPU resources will be needed to authenticate users if
-# this value is increased.
+# With a lot of rounds, it is more difficult to brute forcing the password.
+# But note also that it more CPU resources will be needed to authenticate
+# users.
 #
-# If not specified, the libc will choose the default number of rounds (5000),
-# which is orders of magnitude too low for modern hardware.
-# The values must be within the 1000-999999999 range.
+# If not specified, the libc will choose the default number of rounds (5000).
+# The values must be inside the 1000-999999999 range.
 # If only one of the MIN or MAX values is set, then this value will be used.
 # If MIN > MAX, the highest value will be used.
 #
-#SHA_CRYPT_MIN_ROUNDS 5000
-#SHA_CRYPT_MAX_ROUNDS 5000
-
-#
-# Only works if ENCRYPT_METHOD is set to BCRYPT.
-#
-# Define the number of BCRYPT rounds.
-# With a lot of rounds, it is more difficult to brute-force the password.
-# However, more CPU resources will be needed to authenticate users if
-# this value is increased.
-#
-# If not specified, 13 rounds will be attempted.
-# If only one of the MIN or MAX values is set, then this value will be used.
-# If MIN > MAX, the highest value will be used.
-#
-#BCRYPT_MIN_ROUNDS 13
-#BCRYPT_MAX_ROUNDS 13
-
-#
-# Only works if ENCRYPT_METHOD is set to YESCRYPT.
-#
-# Define the YESCRYPT cost factor.
-# With a higher cost factor, it is more difficult to brute-force the password.
-# However, more CPU time and more memory will be needed to authenticate users
-# if this value is increased.
-#
-# If not specified, a cost factor of 5 will be used.
-# The value must be within the 1-11 range.
-#
-#YESCRYPT_COST_FACTOR 5
+# SHA_CRYPT_MIN_ROUNDS 5000
+# SHA_CRYPT_MAX_ROUNDS 5000

 #
 # List of groups to add to the user's supplementary group set
-# when logging in from the console (as determined by the CONSOLE
+# when logging in on the console (as determined by the CONSOLE
 # setting).  Default is none.
 #
 # Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in from the console.
+# access to these groups, even when not logged in on the console.
 # How to do it is left as an exercise for the reader...
 #
 #CONSOLE_GROUPS		floppy:audio:cdrom

 #
 # Should login be allowed if we can't cd to the home directory?
-# Default is no.
+# Default in no.
 #
 DEFAULT_HOME	yes

-#
-# The pwck(8) utility emits a warning for any system account with a home
-# directory that does not exist.  Some system accounts intentionally do
-# not have a home directory.  Such accounts may have this string as
-# their home directory in /etc/passwd to avoid a spurious warning.
-#
-NONEXISTENT	/nonexistent
-
 #
 # If this file exists and is readable, login environment will be
 # read from it.  Every line should be in the form name=value.
@@ -424,55 +353,17 @@ ENVIRON_FILE	/etc/environment
 # (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
 # the same as gid, and username is the same as the primary group name.
 #
-# This also enables userdel(8) to remove user groups if no members exist.
+# This also enables userdel to remove user groups if no members exist.
 #
 USERGROUPS_ENAB yes

 #
-# If set to a non-zero number, the shadow utilities will make sure that
+# If set to a non-nul number, the shadow utilities will make sure that
 # groups never have more than this number of users on one line.
-# This permits to support split groups (groups split into multiple lines,
+# This permit to support split groups (groups split into multiple lines,
 # with the same group ID, to avoid limitation of the line length in the
 # group file).
 #
 # 0 is the default value and disables this feature.
 #
 #MAX_MEMBERS_PER_GROUP	0
-
-#
-# If useradd(8) should create home directories for users by default (non
-# system users only).
-# This option is overridden with the -M or -m flags on the useradd(8)
-# command-line.
-#
-#CREATE_HOME     yes
-
-#
-# Force use shadow, even if shadow passwd & shadow group files are
-# missing.
-#
-#FORCE_SHADOW    yes
-
-#
-# Allow newuidmap and newgidmap when running under an alternative
-# primary group.
-#
-#GRANT_AUX_GROUP_SUBIDS yes
-
-#
-# Prevents an empty password field to be interpreted as "no authentication
-# required".
-# Set to "yes" to prevent for all accounts
-# Set to "superuser" to prevent for UID 0 / root (default)
-# Set to "no" to not prevent for any account (dangerous, historical default)
-PREVENT_NO_AUTH superuser
-
-#
-# Select the HMAC cryptography algorithm.
-# 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
-# that are available in your system.
-#
-#HMAC_CRYPTO_ALGO SHA512
--- a/etc/pam.d/Makefile.am
+++ b/etc/pam.d/Makefile.am
@@ -2,20 +2,19 @@
 # and also cooperate to make a distribution for `make dist'

 pamd_files = \
-	chfn \
-	chsh \
-	groupmems \
-	login \
-	passwd
-
-pamd_acct_tools_files = \
 	chage \
+	chfn \
 	chgpasswd \
 	chpasswd \
+	chsh \
 	groupadd \
 	groupdel \
+	groupmems \
 	groupmod \
+	login \
 	newusers \
+	passwd \
+	su \
 	useradd \
 	userdel \
 	usermod
@@ -23,13 +22,6 @@ pamd_acct_tools_files = \
 if USE_PAM
 pamddir = $(sysconfdir)/pam.d
 pamd_DATA = $(pamd_files)
-if ACCT_TOOLS_SETUID
-pamd_DATA += $(pamd_acct_tools_files)
-endif
 endif

-if WITH_SU
-pamd_files += su
-endif
-
-EXTRA_DIST = $(pamd_files) $(pamd_acct_tools_files)
+EXTRA_DIST = $(pamd_files)
--- a/etc/pam.d/login
+++ b/etc/pam.d/login
@@ -4,8 +4,8 @@ auth		include		system-auth
 account		required	pam_nologin.so
 account		include		system-auth
 password	include		system-auth
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+session		required	pam_selinux.so close
 session		include		system-auth
 session		required	pam_loginuid.so
 session		optional	pam_console.so
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+session		required	pam_selinux.so open
--- a/etc/pam.d/su
+++ b/etc/pam.d/su
@@ -7,7 +7,7 @@ auth		required	pam_wheel.so use_uid
 auth		include		system-auth
 account		include		system-auth
 password	include		system-auth
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+session		required	pam_selinux.so close
 session		include		system-auth
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+session		required	pam_selinux.so open multiple
 session		optional	pam_xauth.so
--- a/etc/shadow-maint/groupdel-pre.d/01-kill_group_procs.sh
+++ b/etc/shadow-maint/groupdel-pre.d/01-kill_group_procs.sh
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-GROUPID=`awk -F: '$1 == "'"${SUBJECT}"'" { print $3 }' /etc/group`
-
-if [ "${GROUPID}" = "" ]; then
-    exit 0
-fi
-
-for status in /proc/*/status; do
-    # either this isn't a process or its already dead since expanding the list
-    [ -f "$status" ] || continue
-
-    tbuf=${status%/status}
-    pid=${tbuf#/proc/}
-    case "$pid" in
-        "$$") continue;;
-        [0-9]*) :;;
-        *) continue
-    esac
-    
-    grep -q '^Groups:.*\b'"${GROUPID}"'\b.*' "/proc/$pid/status" || continue
-
-    kill -9 "$pid" || echo "cannot kill $pid" 1>&2
-done
-
--- a/etc/shadow-maint/userdel-pre.d/01-kill_user_procs.sh
+++ b/etc/shadow-maint/userdel-pre.d/01-kill_user_procs.sh
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-# Check user exists, and if so, send sigkill to processes that the user owns
-
-ps -eo user >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-    RUNNING=`ps -eo user | grep -Fx "$SUBJECT" | wc -l`
-    # if the user does not exist, RUNNING will be 0
-    if [ "${RUNNING}x" = "0x" ]; then
-        exit 0
-    fi
-fi
-
-# If there is no ps -eo, traverse the process directly.
-
-ls -1 /proc | while IFS= read -r PROC; do
-  echo "$PROC" | grep -E '^[0-9]+$' >/dev/null
-  if [ $? -ne 0 ]; then
-    continue
-  fi
-  if [ -d "/proc/${PROC}" ]; then
-    USR=`stat -c "%U" /proc/${PROC}`
-    if [ "${USR}" = "${SUBJECT}" ]; then
-      echo "Killing ${SUBJECT} owned ${PROC}"
-      kill -9 "${PROC}"
-    fi
-  fi
-done
-
--- a/etc/useradd
+++ b/etc/useradd
@@ -0,0 +1,8 @@
+# useradd defaults file
+GROUP=1000
+HOME=/home
+INACTIVE=-1
+EXPIRE=
+SHELL=/bin/bash
+SKEL=/etc/skel
+CREATE_MAIL_SPOOL=yes
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,17 +1,11 @@

 AUTOMAKE_OPTIONS = 1.0 foreign

-DEFS =
+DEFS = 

 noinst_LTLIBRARIES = libshadow.la

-libshadow_la_CPPFLAGS = $(ECONF_CPPFLAGS)
-if HAVE_VENDORDIR
-libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
-endif
-
-libshadow_la_CPPFLAGS += -I$(top_srcdir)
-libshadow_la_CFLAGS = $(LIBBSD_CFLAGS)
+libshadow_la_LDFLAGS = -version-info 0:0:0

 libshadow_la_SOURCES = \
 	commonio.c \
@@ -20,28 +14,16 @@ libshadow_la_SOURCES = \
 	encrypt.c \
 	exitcodes.h \
 	faillog.h \
-	fields.c \
 	fputsx.c \
 	getdef.c \
 	getdef.h \
-	get_gid.c \
-	getlong.c \
-	get_pid.c \
-	get_uid.c \
-	getulong.c \
 	groupio.c \
 	groupmem.c \
 	groupio.h \
 	gshadow.c \
 	lockpw.c \
-	nss.c \
 	nscd.c \
 	nscd.h \
-	shadowlog.c \
-	shadowlog.h \
-	shadowlog_internal.h \
-	sssd.c \
-	sssd.h \
 	pam_defs.h \
 	port.c \
 	port.h \
@@ -51,27 +33,15 @@ libshadow_la_SOURCES = \
 	pwio.c \
 	pwio.h \
 	pwmem.c \
-	run_part.h \
-	run_part.c \
-	subordinateio.h \
-	subordinateio.c \
-	selinux.c \
-	semanage.c \
 	sgetgrent.c \
 	sgetpwent.c \
-	sgetspent.c \
 	sgroupio.c \
 	sgroupio.h\
 	shadow.c \
 	shadowio.c \
 	shadowio.h \
 	shadowmem.c \
-	spawn.c \
-	write_full.c
-
-if WITH_TCB
-libshadow_la_SOURCES += tcbfuncs.c tcbfuncs.h
-endif
+	utent.c

 # These files are unneeded for some reason, listed in
 # order of appearance:
--- a/lib/alloc.h
+++ b/lib/alloc.h
@@ -1,115 +0,0 @@
-/*
- * SPDX-FileCopyrightText:  2023, 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 "defines.h"
-
-
-#define CALLOC(n, type)   ((type *) calloc(n, sizeof(type)))
-#define XCALLOC(n, type)  ((type *) xcalloc(n, sizeof(type)))
-#define MALLOC(n, type)   ((type *) mallocarray(n, sizeof(type)))
-#define XMALLOC(n, type)  ((type *) xmallocarray(n, sizeof(type)))
-
-#define REALLOC(ptr, n, type)                                                 \
-({                                                                            \
-	__auto_type  p_ = (ptr);                                              \
-                                                                              \
-	static_assert(__builtin_types_compatible_p(typeof(p_), type *), "");  \
-                                                                              \
-	(type *) reallocarray(p_, n, sizeof(type));                           \
-})
-
-#define REALLOCF(ptr, n, type)                                                \
-({                                                                            \
-	__auto_type  p_ = (ptr);                                              \
-                                                                              \
-	static_assert(__builtin_types_compatible_p(typeof(p_), type *), "");  \
-                                                                              \
-	(type *) reallocarrayf(p_, n, sizeof(type));                          \
-})
-
-#define XREALLOC(ptr, n, type)                                                \
-({                                                                            \
-	__auto_type  p_ = (ptr);                                              \
-                                                                              \
-	static_assert(__builtin_types_compatible_p(typeof(p_), type *), "");  \
-                                                                              \
-	(type *) xreallocarray(p_, n, sizeof(type));                          \
-})
-
-
-ATTR_MALLOC(free)
-inline void *xmalloc(size_t size);
-ATTR_MALLOC(free)
-inline void *xmallocarray(size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-inline void *mallocarray(size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-inline char *xstrdup(const char *str);
-
-ATTR_MALLOC(free)
-void *xcalloc(size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-void *xreallocarray(void *p, size_t nmemb, size_t size);
-
-
-inline void *
-xmalloc(size_t size)
-{
-	return xmallocarray(1, size);
-}
-
-
-inline void *
-xmallocarray(size_t nmemb, size_t size)
-{
-	return xreallocarray(NULL, nmemb, size);
-}
-
-
-inline void *
-mallocarray(size_t nmemb, size_t size)
-{
-	return reallocarray(NULL, nmemb, size);
-}
-
-
-inline void *
-reallocarrayf(void *p, size_t nmemb, size_t size)
-{
-	void  *q;
-
-	q = reallocarray(p, nmemb, size);
-
-	/* realloc(p, 0) is equivalent to free(p);  avoid double free.  */
-	if (q == NULL && nmemb != 0 && size != 0)
-		free(p);
-	return q;
-}
-
-
-inline char *
-xstrdup(const char *str)
-{
-	return strcpy(XMALLOC(strlen(str) + 1, char), str);
-}
-
-
-#endif  // include guard
--- a/lib/bit.h
+++ b/lib/bit.h
@@ -1,53 +0,0 @@
-/*
- * SPDX-FileCopyrightText:  2022 - 2023, Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
-
-
-#ifndef SHADOW_INCLUDE_LIB_BIT_H_
-#define SHADOW_INCLUDE_LIB_BIT_H_
-
-
-#include <config.h>
-
-#include <limits.h>
-
-
-#ifndef ULONG_WIDTH
-#define ULONG_WIDTH (sizeof(unsigned long) * CHAR_BIT)
-#endif
-
-
-inline unsigned long bit_ceilul(unsigned long x);
-inline unsigned long bit_ceil_wrapul(unsigned long x);
-inline int leading_zerosul(unsigned long x);
-
-
-/* stdc_bit_ceilul(3) */
-inline unsigned long
-bit_ceilul(unsigned long x)
-{
-	return 1 + (ULONG_MAX >> leading_zerosul(x));
-}
-
-
-/* stdc_bit_ceilul(3), but wrap instead of having Undefined Behavior */
-inline unsigned long
-bit_ceil_wrapul(unsigned long x)
-{
-	if (x == 0)
-		return 0;
-
-	return bit_ceilul(x);
-}
-
-/* stdc_leading_zerosul(3) */
-inline int
-leading_zerosul(unsigned long x)
-{
-	return (x == 0) ? ULONG_WIDTH : __builtin_clzl(x);
-}
-
-
-#endif  // include guard
--- a/lib/commonio.c
+++ b/lib/commonio.c
--- a/lib/commonio.h
+++ b/lib/commonio.h
@@ -1,27 +1,50 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2010, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001 - 2005, Tomasz Kłoczko
+ * Copyright (c) 2007 - 2008, Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 /* $Id$ */
-#ifndef COMMONIO_H
-#define COMMONIO_H
-
-#include "defines.h" /* bool */
+#ifndef _COMMONIO_H
+#define _COMMONIO_H

+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif
 /*
 * Linked list entry.
 */
 struct commonio_entry {
-	/*@null@*/char *line;
-	/*@null@*/void *eptr;		/* struct passwd, struct spwd, ... */
-	/*@dependent@*/ /*@null@*/struct commonio_entry *prev;
-	/*@owned@*/ /*@null@*/struct commonio_entry *next;
-	bool changed:1;
+	char *line;
+	void *eptr;		/* struct passwd, struct spwd, ... */
+	struct commonio_entry *prev, *next;
+	unsigned int changed:1;
 };

 /*
@@ -32,12 +55,12 @@ 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 *);
+	void *(*dup) (const void *);

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

 	/*
 	 * Return the name of the object (for example, pw_name
@@ -61,7 +84,7 @@ struct commonio_ops {
 	 * fgets and fputs (can be replaced by versions that
 	 * understand line continuation conventions).
 	 */
-	/*@null@*/char *(*fgets) (/*@returned@*/ /*@out@*/char *s, int n, FILE *stream);
+	char *(*fgets) (char *, int, FILE *);
 	int (*fputs) (const char *, FILE *);

 	/*
@@ -70,8 +93,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);
+	int (*open_hook) (void);
+	int (*close_hook) (void);
 };

 /*
@@ -86,60 +109,47 @@ struct commonio_db {
 	/*
 	 * Operations from above.
 	 */
-	/*@observer@*/const struct commonio_ops *ops;
+	struct commonio_ops *ops;

 	/*
 	 * Currently open file stream.
 	 */
-	/*@dependent@*/ /*@null@*/FILE *fp;
+	FILE *fp;

 #ifdef WITH_SELINUX
-	/*@null@*/char *scontext;
+	security_context_t scontext;
 #endif
-	/*
-	 * Default permissions and owner for newly created data file.
-         */
-	mode_t st_mode;
-	uid_t st_uid;
-	gid_t st_gid;
 	/*
 	 * Head, tail, current position in linked list.
 	 */
-	/*@owned@*/ /*@null@*/struct commonio_entry *head;
-	/*@dependent@*/ /*@null@*/struct commonio_entry *tail;
-	/*@dependent@*/ /*@null@*/struct commonio_entry *cursor;
+	struct commonio_entry *head, *tail, *cursor;

 	/*
 	 * Various flags.
 	 */
-	bool changed:1;
-	bool isopen:1;
-	bool locked:1;
-	bool readonly:1;
-	bool setname:1;
+	unsigned int changed:1;
+	unsigned int isopen:1;
+	unsigned int locked:1;
+	unsigned int readonly:1;
 };

 extern int commonio_setname (struct commonio_db *, const char *);
-extern bool commonio_present (const struct commonio_db *db);
+extern int commonio_present (const struct commonio_db *);
 extern int commonio_lock (struct commonio_db *);
-extern int commonio_lock_nowait (struct commonio_db *, bool log);
-extern int do_fcntl_lock (const char *file, bool log, short type);
+extern int commonio_lock_nowait (struct commonio_db *);
 extern int commonio_open (struct commonio_db *, int);
-extern /*@observer@*/ /*@null@*/const void *commonio_locate (struct commonio_db *, const char *);
+extern const void *commonio_locate (struct commonio_db *, const char *);
 extern int commonio_update (struct commonio_db *, const void *);
-#ifdef ENABLE_SUBIDS
-extern int commonio_append (struct commonio_db *, const void *);
-#endif				/* ENABLE_SUBIDS */
 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 const void *commonio_next (struct commonio_db *);
 extern int commonio_close (struct commonio_db *);
 extern int commonio_unlock (struct commonio_db *);
 extern void commonio_del_entry (struct commonio_db *,
-                                const struct commonio_entry *);
+				const struct commonio_entry *);
 extern int commonio_sort_wrt (struct commonio_db *shadow,
-                              const struct commonio_db *passwd);
+			      struct commonio_db *passwd);
 extern int commonio_sort (struct commonio_db *db,
-                          int (*cmp) (const void *, const void *));
+			  int (*cmp) (const void *, const void *));

 #endif
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -4,64 +4,98 @@
 #ifndef _DEFINES_H_
 #define _DEFINES_H_

-#include "config.h"
+#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))

-#include <stdbool.h>
-#include <locale.h>
+/* Take care of NLS matters.  */
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif

 #define gettext_noop(String) (String)
 /* #define gettext_def(String) "#define String" */

-#ifdef ENABLE_NLS
+#if ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
 #else
 # undef bindtextdomain
-# define bindtextdomain(Domain, Directory)	(NULL)
+# define bindtextdomain(Domain, Directory)	/* empty */
 # undef textdomain
-# define textdomain(Domain)	(NULL)
+# define textdomain(Domain)	/* empty */
 # define _(Text) Text
 # define ngettext(Msgid1, Msgid2, N) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
 #endif

-#include <stdlib.h>
-#include <string.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <string.h>
+#else				/* not STDC_HEADERS */
+# ifndef HAVE_STRCHR
+#  define strchr index
+#  define strrchr rindex
+# endif
+char *strchr (), *strrchr (), *strtok ();

-#include <errno.h>
+# ifndef HAVE_MEMCPY
+#  define memcpy(d, s, n) bcopy((s), (d), (n))
+# endif
+#endif				/* not STDC_HEADERS */
+
+#if HAVE_ERRNO_H
+# include <errno.h>
+#endif

 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/wait.h>
-
-#include <unistd.h>
-
-/*
- * crypt(3), crypt_gensalt(3), and their
- * feature test macros may be defined in here.
- */
-#if HAVE_CRYPT_H
-# include <crypt.h>
+#if HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 #endif

-#include <sys/time.h>
-#include <time.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif

-#ifdef HAVE_MEMSET_EXPLICIT
-# define memzero(ptr, size) memset_explicit((ptr), 0, (size))
-#elif defined HAVE_EXPLICIT_BZERO	/* !HAVE_MEMSET_S */
-# define memzero(ptr, size) explicit_bzero((ptr), (size))
-#else					/* !HAVE_MEMSET_S && HAVE_EXPLICIT_BZERO */
-static inline void memzero(void *ptr, size_t size)
-{
-	ptr = memset(ptr, '\0', size);
-	__asm__ __volatile__ ("" : : "r"(ptr) : "memory");
-}
-#endif					/* !HAVE_MEMSET_S && !HAVE_EXPLICIT_BZERO */
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else				/* not TIME_WITH_SYS_TIME */
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif				/* not TIME_WITH_SYS_TIME */

+#ifdef HAVE_MEMSET
+# define memzero(ptr, size) memset((void *)(ptr), 0, (size))
+#else
+# define memzero(ptr, size) bzero((char *)(ptr), (size))
+#endif
 #define strzero(s) memzero(s, strlen(s))	/* warning: evaluates twice */

-#include <dirent.h>
+#ifdef HAVE_DIRENT_H		/* DIR_SYSV */
+# include <dirent.h>
+# define DIRECT dirent
+#else
+# ifdef HAVE_SYS_NDIR_H		/* DIR_XENIX */
+#  include <sys/ndir.h>
+# endif
+# ifdef HAVE_SYS_DIR_H		/* DIR_??? */
+#  include <sys/dir.h>
+# endif
+# ifdef HAVE_NDIR_H		/* DIR_BSD */
+#  include <ndir.h>
+# endif
+# define DIRECT direct
+#endif

 /*
 * Possible cases:
@@ -83,6 +117,7 @@ static inline void memzero(void *ptr, size_t size)
 #endif
 #endif

+#ifdef USE_SYSLOG
 #include <syslog.h>

 #ifndef LOG_WARN
@@ -101,7 +136,7 @@ static inline void memzero(void *ptr, size_t size)

 /* cleaner than lots of #ifdefs everywhere - use this as follows:
   SYSLOG((LOG_CRIT, "user %s cracked root", user)); */
-#ifdef ENABLE_NLS
+#if ENABLE_NLS
 /* Temporarily set LC_TIME to "C" to avoid strange dates in syslog.
   This is a workaround for a more general syslog(d) design problem -
   syslogd should log the current system time for each event, and not
@@ -111,24 +146,29 @@ static inline void memzero(void *ptr, size_t size)
 * --Nekral */
 #define SYSLOG(x)							\
 	do {								\
-		char *old_locale = setlocale (LC_ALL, NULL);		\
-		char *saved_locale = NULL;				\
-		if (NULL != old_locale) {				\
-			saved_locale = strdup (old_locale);		\
-		}							\
-		if (NULL != saved_locale) {				\
-			(void) setlocale (LC_ALL, "C");			\
-		}							\
+		char *saved_locale = setlocale(LC_ALL, NULL);		\
+		if (saved_locale)					\
+			saved_locale = strdup(saved_locale);		\
+		if (saved_locale)					\
+			setlocale(LC_ALL, "C");			\
 		syslog x ;						\
-		if (NULL != saved_locale) {				\
-			(void) setlocale (LC_ALL, saved_locale);	\
-			free (saved_locale);				\
+		if (saved_locale) {					\
+			setlocale(LC_ALL, saved_locale);		\
+			free(saved_locale);				\
 		}							\
-	} while (false)
+	} while (0)
 #else				/* !ENABLE_NLS */
 #define SYSLOG(x) syslog x
 #endif				/* !ENABLE_NLS */

+#else				/* !USE_SYSLOG */
+
+#define SYSLOG(x)		/* empty */
+#define openlog(a,b,c)		/* empty */
+#define closelog()		/* empty */
+
+#endif				/* !USE_SYSLOG */
+
 /* The default syslog settings can now be changed here,
   in just one place.  */

@@ -143,10 +183,57 @@ static inline void memzero(void *ptr, size_t size)

 #define OPENLOG(progname) openlog(progname, SYSLOG_OPTIONS, SYSLOG_FACILITY)

-#include <termios.h>
-#define STTY(fd, termio) tcsetattr(fd, TCSANOW, termio)
-#define GTTY(fd, termio) tcgetattr(fd, termio)
-#define TERMIO struct termios
+#ifndef F_OK
+# define F_OK 0
+# define X_OK 1
+# define W_OK 2
+# define R_OK 4
+#endif
+
+#ifndef SEEK_SET
+# define SEEK_SET 0
+# define SEEK_CUR 1
+# define SEEK_END 2
+#endif
+
+#ifdef STAT_MACROS_BROKEN
+# define S_ISDIR(x) ((x) & S_IFMT) == S_IFDIR)
+# define S_ISREG(x) ((x) & S_IFMT) == S_IFREG)
+# ifdef S_IFLNK
+#  define S_ISLNK(x) ((x) & S_IFMT) == S_IFLNK)
+# endif
+#endif
+
+#ifndef S_ISLNK
+#define S_ISLNK(x) (0)
+#endif
+
+#if HAVE_LCHOWN
+#define LCHOWN lchown
+#else
+#define LCHOWN chown
+#endif
+
+#if HAVE_LSTAT
+#define LSTAT lstat
+#else
+#define LSTAT stat
+#endif
+
+#if HAVE_TERMIOS_H
+# include <termios.h>
+# define STTY(fd, termio) tcsetattr(fd, TCSANOW, termio)
+# define GTTY(fd, termio) tcgetattr(fd, termio)
+# define TERMIO struct termios
+# define USE_TERMIOS
+#else				/* assumed HAVE_TERMIO_H */
+# include <sys/ioctl.h>
+# include <termio.h>
+# define STTY(fd, termio) ioctl(fd, TCSETA, termio)
+# define GTTY(fd, termio) ioctl(fd, TCGETA, termio)
+# define TEMRIO struct termio
+# define USE_TERMIO
+#endif

 /*
 * Password aging constants
@@ -169,10 +256,6 @@ static inline void memzero(void *ptr, size_t size)
 #define SCALE DAY
 #endif

-#define WIDTHOF(x)   (sizeof(x) * CHAR_BIT)
-#define NITEMS(arr)  (sizeof((arr)) / sizeof((arr)[0]))
-#define STRLEN(s)    (NITEMS(s) - 1)
-
 /* Copy string pointed by B to array A with size checking.  It was originally
   in lmain.c but is _very_ useful elsewhere.  Some setuid root programs with
   very sloppy coding used to assume that BUFSIZ will always be enough...  */
@@ -199,6 +282,18 @@ static inline void memzero(void *ptr, size_t size)
 #endif
 #endif

+#ifndef NULL
+#define NULL ((void *) 0)
+#endif
+
+#ifdef sun			/* hacks for compiling on SunOS */
+# ifndef SOLARIS
+extern int fputs ();
+extern char *strdup ();
+extern char *strerror ();
+# 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
@@ -208,8 +303,6 @@ static inline void memzero(void *ptr, size_t size)
 #define SHADOW_PASSWD_STRING "x"
 #endif

-#define SHADOW_SP_FLAG_UNSET ((unsigned long int)-1)
-
 #ifdef WITH_AUDIT
 #ifdef __u8			/* in case we use pam < 0.80 */
 #undef __u8
@@ -223,28 +316,9 @@ static inline void memzero(void *ptr, size_t size)

 /* To be used for verified unused parameters */
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-# define unused    __attribute__((unused))
-# define NORETURN  __attribute__((__noreturn__))
-# define format_attr(type, index, check) __attribute__((format (type, index, check)))
+# define unused __attribute__((unused))
 #else
 # define unused
-# define NORETURN
-# define format_attr(type, index, check)
-#endif
-
-/* Maximum length of passwd entry */
-#define PASSWD_ENTRY_MAX_LENGTH 32768
-
-#if (__GNUC__ >= 11) && !defined(__clang__)
-# define ATTR_MALLOC(deallocator)  [[gnu::malloc(deallocator)]]
-#else
-# define ATTR_MALLOC(deallocator)
-#endif
-
-#ifdef HAVE_SECURE_GETENV
-#  define shadow_getenv(name) secure_getenv(name)
-# else
-#  define shadow_getenv(name) getenv(name)
 #endif

 #endif				/* _DEFINES_H_ */
--- a/lib/encrypt.c
+++ b/lib/encrypt.c
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1993, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2010, Nicolas François
+ * Copyright (c) 1990 - 1993, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2007 - 2008, Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -16,45 +39,39 @@

 #include "prototypes.h"
 #include "defines.h"
-#include "shadowlog_internal.h"

-/*@exposed@*//*@null@*/char *pw_encrypt (const char *clear, const char *salt)
+char *pw_encrypt (const char *clear, const char *salt)
 {
 	static char cipher[128];
 	char *cp;

 	cp = crypt (clear, salt);
-	if (NULL == cp) {
+	if (!cp) {
 		/*
 		 * Single Unix Spec: crypt() may return a null pointer,
-		 * and set errno to indicate an error. In this case return
-		 * the NULL so the caller can handle appropriately.
+		 * and set errno to indicate an error.  The caller doesn't
+		 * expect us to return NULL, so...
 		 */
-		return NULL;
+		perror ("crypt");
+		exit (1);
 	}

-	/* Some crypt() do not return NULL if the algorithm is not
+	/* The GNU crypt does not return NULL if the algorithm is not
 	 * supported, and return a DES encrypted password. */
-	if ((NULL != salt) && (salt[0] == '$') && (strlen (cp) <= 13))
+	if (salt && salt[0] == '$' && strlen (cp) <= 13)
 	{
-		/*@observer@*/const char *method;
+		const char *method;
 		switch (salt[1])
 		{
 			case '1':
 				method = "MD5";
 				break;
-			case '2':
-				method = "BCRYPT";
-				break;
 			case '5':
 				method = "SHA256";
 				break;
 			case '6':
 				method = "SHA512";
 				break;
-			case 'y':
-				method = "YESCRYPT";
-				break;
 			default:
 			{
 				static char nummethod[4] = "$x$";
@@ -62,18 +79,15 @@
 				method = &nummethod[0];
 			}
 		}
-		(void) fprintf (shadow_logfd,
-		                _("crypt method not supported by libcrypt? (%s)\n"),
-		                method);
-		exit (EXIT_FAILURE);
+		fprintf (stderr,
+			 _("crypt method not supported by libcrypt? (%s)\n"),
+			  method);
+		exit (1);
 	}

-	if (strlen (cp) != 13) {
+	if (strlen (cp) != 13)
 		return cp;	/* nonstandard crypt() in libc, better bail out */
-	}
-
 	strcpy (cipher, cp);

 	return cipher;
 }
-
--- a/lib/exitcodes.h
+++ b/lib/exitcodes.h
@@ -1,7 +1,30 @@
 /*
- * SPDX-FileCopyrightText: 2005 - 2006, Tomasz Kłoczko
+ * Copyright (c) 2005 - 2006, Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 /* $Id$ */
@@ -9,12 +32,7 @@
 /*
 * Exit codes used by shadow programs
 */
-#define E_SUCCESS       	EXIT_SUCCESS	/* success */
-/*
- * FIXME: other values should differ from EXIT_FAILURE (and EXIT_SUCCESS).
- *
- * FIXME: reserve EXIT_FAILURE for internal failures.
- */
+#define E_SUCCESS       	0	/* success */
 #define E_NOPERM        	1	/* permission denied */
 #define E_USAGE         	2	/* invalid command syntax */
 #define E_BAD_ARG       	3	/* invalid argument to option */
--- a/lib/faillog.h
+++ b/lib/faillog.h
@@ -1,9 +1,32 @@
 /*
- * SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
+ * Copyright (c) 1989 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1997, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 /*
@@ -22,8 +45,8 @@
 struct faillog {
 	short fail_cnt;		/* failures since last success */
 	short fail_max;		/* failures before turning account off */
-	char fail_line[12];	/* last failure occurred here */
-	time_t fail_time;	/* last failure occurred then */
+	char fail_line[12];	/* last failure occured here */
+	time_t fail_time;	/* last failure occured then */
 	/*
 	 * If nonzero, the account will be re-enabled if there are no
 	 * failures for fail_locktime seconds since last failure.
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -1,105 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1990       , Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-#include "prototypes.h"
-
-/*
- * valid_field - insure that a field contains all legal characters
- *
- * The supplied field is scanned for non-printable and other illegal
- * characters.
- *  + -1 is returned if an illegal or control character is present.
- *  +  1 is returned if no illegal or control characters are present,
- *       but the field contains a non-printable character.
- *  +  0 is returned otherwise.
- */
-int valid_field (const char *field, const char *illegal)
-{
-	const char *cp;
-	int err = 0;
-
-	if (NULL == field) {
-		return -1;
-	}
-
-	/* For each character of field, search if it appears in the list
-	 * of illegal characters. */
-	if (illegal && NULL != strpbrk (field, illegal)) {
-		return -1;
-	}
-
-	/* Search if there are non-printable or control characters */
-	for (cp = field; '\0' != *cp; cp++) {
-		unsigned char c = *cp;
-		if (!isprint (c)) {
-			err = 1;
-		}
-		if (iscntrl (c)) {
-			err = -1;
-			break;
-		}
-	}
-
-	return err;
-}
-
-/*
- * change_field - change a single field if a new value is given.
- *
- * prompt the user with the name of the field being changed and the
- * current value.
- */
-void change_field (char *buf, size_t maxsize, const char *prompt)
-{
-	char newf[200];
-	char *cp;
-
-	if (maxsize > sizeof (newf)) {
-		maxsize = sizeof (newf);
-	}
-
-	printf ("\t%s [%s]: ", prompt, buf);
-	(void) fflush (stdout);
-	if (fgets (newf, maxsize, stdin) != newf) {
-		return;
-	}
-
-	cp = strchr (newf, '\n');
-	if (NULL == cp) {
-		return;
-	}
-	*cp = '\0';
-
-	if ('\0' != newf[0]) {
-		/*
-		 * Remove leading and trailing whitespace.  This also
-		 * makes it possible to change the field to empty, by
-		 * entering a space.  --marekm
-		 */
-
-		while (newf < cp && isspace (cp[-1])) {
-			cp--;
-		}
-		*cp = '\0';
-
-		cp = newf;
-		while (isspace (*cp)) {
-			cp++;
-		}
-
-		strcpy (buf, cp);
-	}
-}
--- a/lib/fputsx.c
+++ b/lib/fputsx.c
@@ -1,10 +1,33 @@
 /*
- * 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
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1999, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -16,29 +39,23 @@
 #ident "$Id$"


-/*@null@*/char *fgetsx (/*@returned@*/ /*@out@*/char *buf, int cnt, FILE * f)
+char *fgetsx (char *buf, int cnt, FILE * f)
 {
 	char *cp = buf;
 	char *ep;

 	while (cnt > 0) {
-		if (fgets (cp, cnt, f) != cp) {
-			if (cp == buf) {
+		if (fgets (cp, cnt, f) == 0) {
+			if (cp == buf)
 				return 0;
-			} else {
+			else
 				break;
-			}
 		}
-		ep = strrchr (cp, '\\');
-		if ((NULL != ep) && (*(ep + 1) == '\n')) {
-			cnt -= ep - cp;
-			if (cnt > 0) {
-				cp = ep;
-				*cp = '\0';
-			}
-		} else {
+		if ((ep = strrchr (cp, '\\')) && *(ep + 1) == '\n') {
+			if ((cnt -= ep - cp) > 0)
+				*(cp = ep) = '\0';
+		} else
 			break;
-		}
 	}
 	return buf;
 }
@@ -47,10 +64,9 @@ int fputsx (const char *s, FILE * stream)
 {
 	int i;

-	for (i = 0; '\0' != *s; i++, s++) {
-		if (putc (*s, stream) == EOF) {
+	for (i = 0; *s; i++, s++) {
+		if (putc (*s, stream) == EOF)
 			return EOF;
-		}

 #if 0				/* The standard getgr*() can't handle that.  --marekm */
 		if (i > (BUFSIZ / 2)) {
@@ -64,4 +80,3 @@ int fputsx (const char *s, FILE * stream)
 	}
 	return 0;
 }
-
--- a/lib/get_gid.c
+++ b/lib/get_gid.c
@@ -1,31 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2009       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "prototypes.h"
-#include "defines.h"
-
-int get_gid (const char *gidstr, gid_t *gid)
-{
-	long long int val;
-	char *endptr;
-
-	errno = 0;
-	val = strtoll (gidstr, &endptr, 10);
-	if (   ('\0' == *gidstr)
-	    || ('\0' != *endptr)
-	    || (ERANGE == errno)
-	    || (/*@+longintegral@*/val != (gid_t)val)/*@=longintegral@*/) {
-		return 0;
-	}
-
-	*gid = val;
-	return 1;
-}
-
--- a/lib/get_pid.c
+++ b/lib/get_pid.c
@@ -1,102 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2009       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "prototypes.h"
-#include "defines.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int get_pid (const char *pidstr, pid_t *pid)
-{
-	long long int val;
-	char *endptr;
-
-	errno = 0;
-	val = strtoll (pidstr, &endptr, 10);
-	if (   ('\0' == *pidstr)
-	    || ('\0' != *endptr)
-	    || (ERANGE == errno)
-	    || (val < 1)
-	    || (/*@+longintegral@*/val != (pid_t)val)/*@=longintegral@*/) {
-		return 0;
-	}
-
-	*pid = val;
-	return 1;
-}
-
-/*
- * If use passed in fd:4 as an argument, then return the
- * value '4', the fd to use.
- * On error, return -1.
- */
-int get_pidfd_from_fd(const char *pidfdstr)
-{
-	long long int val;
-	char *endptr;
-	struct stat st;
-	dev_t proc_st_dev, proc_st_rdev;
-
-	errno = 0;
-	val = strtoll (pidfdstr, &endptr, 10);
-	if (   ('\0' == *pidfdstr)
-	    || ('\0' != *endptr)
-	    || (ERANGE == errno)
-	    || (val < 0)
-	    || (/*@+longintegral@*/val != (int)val)/*@=longintegral@*/) {
-		return -1;
-	}
-
-	if (stat("/proc/self/uid_map", &st) < 0) {
-		return -1;
-	}
-
-	proc_st_dev = st.st_dev;
-	proc_st_rdev = st.st_rdev;
-
-	if (fstat(val, &st) < 0) {
-		return -1;
-	}
-
-	if (st.st_dev != proc_st_dev || st.st_rdev != proc_st_rdev) {
-		return -1;
-	}
-
-	return (int)val;
-}
-
-int open_pidfd(const char *pidstr)
-{
-	int proc_dir_fd;
-	int written;
-	char proc_dir_name[32];
-	pid_t target;
-
-	if (get_pid(pidstr, &target) == 0)
-		return -ENOENT;
-
-	/* max string length is 6 + 10 + 1 + 1 = 18, allocate 32 bytes */
-	written = snprintf(proc_dir_name, sizeof(proc_dir_name), "/proc/%u/",
-		target);
-	if ((written <= 0) || ((size_t)written >= sizeof(proc_dir_name))) {
-		fprintf(stderr, "snprintf of proc path failed for %u: %s\n",
-			target, strerror(errno));
-		return -EINVAL;
-	}
-
-	proc_dir_fd = open(proc_dir_name, O_DIRECTORY);
-	if (proc_dir_fd < 0) {
-		fprintf(stderr, _("Could not open proc directory for target %u: %s\n"),
-			target, strerror(errno));
-		return -EINVAL;
-	}
-	return proc_dir_fd;
-}
--- a/lib/get_uid.c
+++ b/lib/get_uid.c
@@ -1,31 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2009       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "prototypes.h"
-#include "defines.h"
-
-int get_uid (const char *uidstr, uid_t *uid)
-{
-	long long int val;
-	char *endptr;
-
-	errno = 0;
-	val = strtoll (uidstr, &endptr, 10);
-	if (   ('\0' == *uidstr)
-	    || ('\0' != *endptr)
-	    || (ERANGE == errno)
-	    || (/*@+longintegral@*/val != (uid_t)val)/*@=longintegral@*/) {
-		return 0;
-	}
-
-	*uid = val;
-	return 1;
-}
-
--- a/lib/getdef.c
+++ b/lib/getdef.c
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1991 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2002 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2008, Nicolas François
+ * Copyright (c) 1991 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2002 - 2006, Tomasz Kłoczko
+ * Copyright (c) 2007 - 2008, Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -13,64 +36,18 @@

 #include "prototypes.h"
 #include "defines.h"
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
-#ifdef USE_ECONF
-#include <libeconf.h>
-#endif
-
-#include "alloc.h"
 #include "getdef.h"
-#include "shadowlog_internal.h"
-
 /*
 * A configuration item definition.
 */
 struct itemdef {
-	/*@null@*/const char *name;	/* name of the item                     */
-	/*@null@*/char *value;		/* value given, or NULL if no value     */
+	const char *name;	/* name of the item                     */
+	char *value;		/* value given, or NULL if no value     */
 };

-#define PAMDEFS					\
-	{"CHFN_AUTH", NULL},			\
-	{"CHSH_AUTH", NULL},			\
-	{"CRACKLIB_DICTPATH", NULL},		\
-	{"ENV_HZ", NULL},			\
-	{"ENVIRON_FILE", NULL},			\
-	{"ENV_TZ", NULL},			\
-	{"FAILLOG_ENAB", NULL},			\
-	{"FTMP_FILE", NULL},			\
-	{"HMAC_CRYPTO_ALGO", NULL},		\
-	{"ISSUE_FILE", NULL},			\
-	{"LASTLOG_ENAB", NULL},			\
-	{"LOGIN_STRING", NULL},			\
-	{"MAIL_CHECK_ENAB", NULL},		\
-	{"MOTD_FILE", NULL},			\
-	{"NOLOGINS_FILE", NULL},		\
-	{"OBSCURE_CHECKS_ENAB", NULL},		\
-	{"PASS_ALWAYS_WARN", NULL},		\
-	{"PASS_CHANGE_TRIES", NULL},		\
-	{"PASS_MAX_LEN", NULL},			\
-	{"PASS_MIN_LEN", NULL},			\
-	{"PORTTIME_CHECKS_ENAB", NULL},		\
-	{"QUOTAS_ENAB", NULL},			\
-	{"SU_WHEEL_ONLY", NULL},		\
-	{"ULIMIT", NULL},
-
-/*
- * Items used in other tools (util-linux, etc.)
- */
-#define FOREIGNDEFS				\
-	{"ALWAYS_SET_PATH", NULL},		\
-	{"ENV_ROOTPATH", NULL},			\
-	{"LOGIN_KEEP_USERNAME", NULL},		\
-	{"LOGIN_PLAIN_PROMPT", NULL},		\
-	{"MOTD_FIRSTONLY", NULL},		\
-
-
 #define NUMDEFS	(sizeof(def_table)/sizeof(def_table[0]))
 static struct itemdef def_table[] = {
 	{"CHFN_RESTRICT", NULL},
@@ -86,10 +63,8 @@ static struct itemdef def_table[] = {
 	{"FAKE_SHELL", NULL},
 	{"GID_MAX", NULL},
 	{"GID_MIN", NULL},
-	{"HOME_MODE", NULL},
 	{"HUSHLOGIN_FILE", NULL},
 	{"KILLCHAR", NULL},
-	{"LASTLOG_UID_MAX", NULL},
 	{"LOGIN_RETRIES", NULL},
 	{"LOGIN_TIMEOUT", NULL},
 	{"LOG_OK_LOGINS", NULL},
@@ -98,7 +73,6 @@ static struct itemdef def_table[] = {
 	{"MAIL_FILE", NULL},
 	{"MAX_MEMBERS_PER_GROUP", NULL},
 	{"MD5_CRYPT_ENAB", NULL},
-	{"NONEXISTENT", NULL},
 	{"PASS_MAX_DAYS", NULL},
 	{"PASS_MIN_DAYS", NULL},
 	{"PASS_WARN_AGE", NULL},
@@ -106,19 +80,6 @@ static struct itemdef def_table[] = {
 	{"SHA_CRYPT_MAX_ROUNDS", NULL},
 	{"SHA_CRYPT_MIN_ROUNDS", NULL},
 #endif
-#ifdef USE_BCRYPT
-	{"BCRYPT_MAX_ROUNDS", NULL},
-	{"BCRYPT_MIN_ROUNDS", NULL},
-#endif
-#ifdef USE_YESCRYPT
-	{"YESCRYPT_COST_FACTOR", NULL},
-#endif
-	{"SUB_GID_COUNT", NULL},
-	{"SUB_GID_MAX", NULL},
-	{"SUB_GID_MIN", NULL},
-	{"SUB_UID_COUNT", NULL},
-	{"SUB_UID_MAX", NULL},
-	{"SUB_UID_MIN", NULL},
 	{"SULOG_FILE", NULL},
 	{"SU_NAME", NULL},
 	{"SYS_GID_MAX", NULL},
@@ -134,48 +95,46 @@ static struct itemdef def_table[] = {
 	{"USERDEL_CMD", NULL},
 	{"USERGROUPS_ENAB", NULL},
 #ifndef USE_PAM
-	PAMDEFS
+	{"CHFN_AUTH", NULL},
+	{"CHSH_AUTH", NULL},
+	{"CRACKLIB_DICTPATH", NULL},
+	{"ENV_HZ", NULL},
+	{"ENVIRON_FILE", NULL},
+	{"ENV_TZ", NULL},
+	{"FAILLOG_ENAB", NULL},
+	{"FTMP_FILE", NULL},
+	{"ISSUE_FILE", NULL},
+	{"LASTLOG_ENAB", NULL},
+	{"LOGIN_STRING", NULL},
+	{"MAIL_CHECK_ENAB", NULL},
+	{"MOTD_FILE", NULL},
+	{"NOLOGINS_FILE", NULL},
+	{"OBSCURE_CHECKS_ENAB", NULL},
+	{"PASS_ALWAYS_WARN", NULL},
+	{"PASS_CHANGE_TRIES", NULL},
+	{"PASS_MAX_LEN", NULL},
+	{"PASS_MIN_LEN", NULL},
+	{"PORTTIME_CHECKS_ENAB", NULL},
+	{"QUOTAS_ENAB", NULL},
+	{"SU_WHEEL_ONLY", NULL},
+	{"ULIMIT", NULL},
 #endif
+#ifdef USE_SYSLOG
 	{"SYSLOG_SG_ENAB", NULL},
 	{"SYSLOG_SU_ENAB", NULL},
-#ifdef WITH_TCB
-	{"TCB_AUTH_GROUP", NULL},
-	{"TCB_SYMLINKS", NULL},
-	{"USE_TCB", NULL},
 #endif
-	{"FORCE_SHADOW", NULL},
-	{"GRANT_AUX_GROUP_SUBIDS", NULL},
-	{"PREVENT_NO_AUTH", NULL},
 	{NULL, NULL}
 };

-#define NUMKNOWNDEFS	(sizeof(knowndef_table)/sizeof(knowndef_table[0]))
-static struct itemdef knowndef_table[] = {
-#ifdef USE_PAM
-	PAMDEFS
-#endif
-	FOREIGNDEFS
-	{NULL, NULL}
-};
-
-#ifdef USE_ECONF
-#ifdef VENDORDIR
-static const char* vendordir = VENDORDIR;
-#else
-static const char* vendordir = NULL;
-#endif
-static const char* sysconfdir = "/etc";
-#else
 #ifndef LOGINDEFS
 #define LOGINDEFS "/etc/login.defs"
 #endif

-static const char* def_fname = LOGINDEFS;	/* login config defs file       */
-#endif
-static bool def_loaded = false;		/* are defs already loaded?     */
+static char def_fname[] = LOGINDEFS;	/* login config defs file       */
+static int def_loaded = 0;	/* are defs already loaded?     */

 /* local function prototypes */
-static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *);
+static struct itemdef *def_find (const char *);
 static void def_load (void);


@@ -186,16 +145,14 @@ static void def_load (void);
 * defined.  First time invoked, will load definitions from the file.
 */

-/*@observer@*/ /*@null@*/const char *getdef_str (const char *item)
+char *getdef_str (const char *item)
 {
 	struct itemdef *d;

-	if (!def_loaded) {
+	if (!def_loaded)
 		def_load ();
-	}

-	d = def_find (item);
-	return (NULL == d) ? NULL : d->value;
+	return ((d = def_find (item)) == NULL ? (char *) NULL : d->value);
 }


@@ -205,18 +162,15 @@ static void def_load (void);
 * Return TRUE if specified item is defined as "yes", else FALSE.
 */

-bool getdef_bool (const char *item)
+int getdef_bool (const char *item)
 {
 	struct itemdef *d;

-	if (!def_loaded) {
+	if (!def_loaded)
 		def_load ();
-	}

-	d = def_find (item);
-	if ((NULL == d) || (NULL == d->value)) {
-		return false;
-	}
+	if ((d = def_find (item)) == NULL || d->value == NULL)
+		return 0;

 	return (strcasecmp (d->value, "yes") == 0);
 }
@@ -233,27 +187,14 @@ bool getdef_bool (const char *item)
 int getdef_num (const char *item, int dflt)
 {
 	struct itemdef *d;
-	long val;

-	if (!def_loaded) {
+	if (!def_loaded)
 		def_load ();
-	}

-	d = def_find (item);
-	if ((NULL == d) || (NULL == d->value)) {
+	if ((d = def_find (item)) == NULL || d->value == NULL)
 		return dflt;
-	}

-	if (   (getlong (d->value, &val) == 0)
-	    || (val > INT_MAX)
-	    || (val < INT_MIN)) {
-		fprintf (shadow_logfd,
-		         _("configuration error - cannot parse %s value: '%s'"),
-		         item, d->value);
-		return dflt;
-	}
-
-	return val;
+	return (int) strtol (d->value, (char **) NULL, 0);
 }


@@ -268,27 +209,14 @@ int getdef_num (const char *item, int dflt)
 unsigned int getdef_unum (const char *item, unsigned int dflt)
 {
 	struct itemdef *d;
-	long val;

-	if (!def_loaded) {
+	if (!def_loaded)
 		def_load ();
-	}

-	d = def_find (item);
-	if ((NULL == d) || (NULL == d->value)) {
+	if ((d = def_find (item)) == NULL || d->value == NULL)
 		return dflt;
-	}

-	if (   (getlong (d->value, &val) == 0)
-	    || (val < 0)
-	    || (val > INT_MAX)) {
-		fprintf (shadow_logfd,
-		         _("configuration error - cannot parse %s value: '%s'"),
-		         item, d->value);
-		return dflt;
-	}
-
-	return val;
+	return (unsigned int) strtoul (d->value, (char **) NULL, 0);
 }


@@ -303,58 +231,16 @@ unsigned int getdef_unum (const char *item, unsigned int dflt)
 long getdef_long (const char *item, long dflt)
 {
 	struct itemdef *d;
-	long val;

-	if (!def_loaded) {
+	if (!def_loaded)
 		def_load ();
-	}

-	d = def_find (item);
-	if ((NULL == d) || (NULL == d->value)) {
+	if ((d = def_find (item)) == NULL || d->value == NULL)
 		return dflt;
-	}

-	if (getlong (d->value, &val) == 0) {
-		fprintf (shadow_logfd,
-		         _("configuration error - cannot parse %s value: '%s'"),
-		         item, d->value);
-		return dflt;
-	}
-
-	return val;
+	return strtol (d->value, (char **) NULL, 0);
 }

-/*
- * getdef_ulong - get unsigned long numerical value from table of definitions
- *
- * Returns numeric value of specified item, else the "dflt" value if
- * the item is not defined.  Octal (leading "0") and hex (leading "0x")
- * values are handled.
- */
-
-unsigned long getdef_ulong (const char *item, unsigned long dflt)
-{
-	struct itemdef *d;
-	unsigned long val;
-
-	if (!def_loaded) {
-		def_load ();
-	}
-
-	d = def_find (item);
-	if ((NULL == d) || (NULL == d->value)) {
-		return dflt;
-	}
-
-	if (getulong (d->value, &val) == 0) {
-		fprintf (shadow_logfd,
-		         _("configuration error - cannot parse %s value: '%s'"),
-		         item, d->value);
-		return dflt;
-	}
-
-	return val;
-}

 /*
 * putdef_str - override the value read from /etc/login.defs
@@ -366,31 +252,29 @@ int putdef_str (const char *name, const char *value)
 	struct itemdef *d;
 	char *cp;

-	if (!def_loaded) {
+	if (!def_loaded)
 		def_load ();
-	}

 	/*
 	 * Locate the slot to save the value.  If this parameter
 	 * is unknown then "def_find" will print an err message.
 	 */
-	d = def_find (name);
-	if (NULL == d) {
+	if ((d = def_find (name)) == NULL)
 		return -1;
-	}

 	/*
 	 * Save off the value.
 	 */
-	cp = strdup (value);
-	if (NULL == cp) {
-		(void) fputs (_("Could not allocate space for config info.\n"),
-		              shadow_logfd);
+	if ((cp = strdup (value)) == NULL) {
+		fputs (_("Could not allocate space for config info.\n"),
+		       stderr);
 		SYSLOG ((LOG_ERR, "could not allocate space for config info"));
 		return -1;
 	}

-	free (d->value);
+	if (d->value)
+		free (d->value);
+
 	d->value = cp;
 	return 0;
 }
@@ -403,67 +287,31 @@ int putdef_str (const char *name, const char *value)
 * specified configuration option.
 */

-static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *name)
+static struct itemdef *def_find (const char *name)
 {
+	int n;
 	struct itemdef *ptr;

+
 	/*
 	 * Search into the table.
 	 */

-	for (ptr = def_table; NULL != ptr->name; ptr++) {
-		if (strcmp (ptr->name, name) == 0) {
+	for (ptr = def_table; ptr->name; ptr++) {
+		if (!(n = strcmp (ptr->name, name)))
 			return ptr;
-		}
 	}

 	/*
 	 * Item was never found.
 	 */

-	for (ptr = knowndef_table; NULL != ptr->name; ptr++) {
-		if (strcmp (ptr->name, name) == 0) {
-			goto out;
-		}
-	}
-	fprintf (shadow_logfd,
-	         _("configuration error - unknown item '%s' (notify administrator)\n"),
-	         name);
+	fprintf (stderr,
+		 _
+		 ("configuration error - unknown item '%s' (notify administrator)\n"),
+		 name);
 	SYSLOG ((LOG_CRIT, "unknown configuration item `%s'", name));
-
-out:
-	return NULL;
-}
-
-/*
- * setdef_config_file - set the default configuration file path
- *
- * must be called prior to any def* calls.
- */
-
-void setdef_config_file (const char* file)
-{
-#ifdef USE_ECONF
-	size_t len;
-	char* cp;
-
-	len = strlen(file) + strlen(sysconfdir) + 2;
-	cp = MALLOC(len, char);
-	if (cp == NULL)
-		exit (13);
-	snprintf(cp, len, "%s/%s", file, sysconfdir);
-	sysconfdir = cp;
-#ifdef VENDORDIR
-	len = strlen(file) + strlen(vendordir) + 2;
-	cp = MALLOC(len, char);
-	if (cp == NULL)
-		exit (13);
-	snprintf(cp, len, "%s/%s", file, vendordir);
-	vendordir = cp;
-#endif
-#else
-	def_fname = file;
-#endif
+	return (struct itemdef *) NULL;
 }

 /*
@@ -472,87 +320,26 @@ void setdef_config_file (const char* file)
 * Loads the user-configured options from the default configuration file
 */

-#ifdef USE_ECONF
-static void def_load (void)
-{
-	econf_file *defs_file = NULL;
-	econf_err error;
-	char **keys;
-	size_t key_number;
-
-	/*
-	 * Set the initialized flag.
-	 * (do it early to prevent recursion in putdef_str())
-	 */
-	def_loaded = true;
-
-	error = econf_readDirs (&defs_file, vendordir, sysconfdir, "login", "defs", " \t", "#");
-	if (error) {
-		if (error == ECONF_NOFILE)
-			return;
-
-		SYSLOG ((LOG_CRIT, "cannot open login definitions [%s]",
-			econf_errString(error)));
-		exit (EXIT_FAILURE);
-	}
-
-	if ((error = econf_getKeys(defs_file, NULL, &key_number, &keys))) {
-		SYSLOG ((LOG_CRIT, "cannot read login definitions [%s]",
-			econf_errString(error)));
-		exit (EXIT_FAILURE);
-	}
-
-	for (size_t i = 0; i < key_number; i++) {
-		char *value;
-
-		error = econf_getStringValue(defs_file, NULL, keys[i], &value);
-		if (error) {
-			SYSLOG ((LOG_CRIT, "failed reading key %zu from econf [%s]",
-				i, econf_errString(error)));
-			exit (EXIT_FAILURE);
-		}
-
-		/*
-		 * Store the value in def_table.
-		 *
-		 * Ignore failures to load the login.defs file.
-		 * The error was already reported to the user and to
-		 * syslog. The tools will just use their default values.
-		 */
-		(void)putdef_str (keys[i], value);
-
-		free(value);
-	}
-
-	econf_free (keys);
-	econf_free (defs_file);
-}
-#else /* USE_ECONF */
 static void def_load (void)
 {
 	int i;
 	FILE *fp;
 	char buf[1024], *name, *value, *s;

+	/*
+	 * Open the configuration definitions file.
+	 */
+	if ((fp = fopen (def_fname, "r")) == NULL) {
+		SYSLOG ((LOG_CRIT, "cannot open login definitions %s [%m]",
+			 def_fname));
+		exit (1);
+	}
+
 	/*
 	 * Set the initialized flag.
 	 * (do it early to prevent recursion in putdef_str())
 	 */
-	def_loaded = true;
-
-	/*
-	 * Open the configuration definitions file.
-	 */
-	fp = fopen (def_fname, "r");
-	if (NULL == fp) {
-		if (errno == ENOENT)
-			return;
-
-		int err = errno;
-		SYSLOG ((LOG_CRIT, "cannot open login definitions %s [%s]",
-		         def_fname, strerror (err)));
-		exit (EXIT_FAILURE);
-	}
+	++def_loaded;

 	/*
 	 * Go through all of the lines in the file.
@@ -562,13 +349,11 @@ static void def_load (void)
 		/*
 		 * Trim trailing whitespace.
 		 */
-		for (i = (ptrdiff_t) strlen (buf) - 1; i >= 0; --i) {
-			if (!isspace (buf[i])) {
+		for (i = strlen (buf) - 1; i >= 0; --i) {
+			if (!isspace (buf[i]))
 				break;
-			}
 		}
-		i++;
-		buf[i] = '\0';
+		buf[++i] = '\0';

 		/*
 		 * Break the line into two fields.
@@ -587,24 +372,18 @@ static void def_load (void)

 		/*
 		 * Store the value in def_table.
-		 *
-		 * Ignore failures to load the login.defs file.
-		 * The error was already reported to the user and to
-		 * syslog. The tools will just use their default values.
 		 */
-		(void)putdef_str (name, value);
+		putdef_str (name, value);
 	}

-	if (ferror (fp) != 0) {
-		int err = errno;
-		SYSLOG ((LOG_CRIT, "cannot read login definitions %s [%s]",
-		         def_fname, strerror (err)));
-		exit (EXIT_FAILURE);
+	if (ferror (fp)) {
+		SYSLOG ((LOG_CRIT, "cannot read login definitions %s [%m]",
+			 def_fname));
+		exit (1);
 	}

 	(void) fclose (fp);
 }
-#endif /* USE_ECONF */


 #ifdef CKDEFS
@@ -617,22 +396,18 @@ int main (int argc, char **argv)
 	def_load ();

 	for (i = 0; i < NUMDEFS; ++i) {
-		d = def_find (def_table[i].name);
-		if (NULL == d) {
+		if ((d = def_find (def_table[i].name)) == NULL)
 			printf ("error - lookup '%s' failed\n",
-			        def_table[i].name);
-		} else {
+				def_table[i].name);
+		else
 			printf ("%4d %-24s %s\n", i + 1, d->name, d->value);
-		}
 	}
 	for (i = 1; i < argc; i++) {
-		cp = getdef_str (argv[1]);
-		if (NULL != cp) {
+		if ((cp = getdef_str (argv[1])) != NULL)
 			printf ("%s `%s'\n", argv[1], cp);
-		} else {
+		else
 			printf ("%s not found\n", argv[1]);
-		}
 	}
-	exit (EXIT_SUCCESS);
+	exit (0);
 }
 #endif
--- a/lib/getdef.h
+++ b/lib/getdef.h
@@ -1,23 +1,43 @@
 /*
- * SPDX-FileCopyrightText: 1991 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2002 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
+ * Copyright (c) 1991 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2002 - 2006, Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef _GETDEF_H
 #define _GETDEF_H

 /* getdef.c */
-extern bool getdef_bool (const char *);
+extern int getdef_bool (const char *);
 extern long getdef_long (const char *, long);
 extern int getdef_num (const char *, int);
-extern unsigned long getdef_ulong (const char *, unsigned long);
 extern unsigned int getdef_unum (const char *, unsigned int);
-extern /*@observer@*/ /*@null@*/const char *getdef_str (const char *);
+extern char *getdef_str (const char *);
 extern int putdef_str (const char *, const char *);
-extern void setdef_config_file (const char* file);

 /* default UMASK value if not specified in /etc/login.defs */
 #define		GETDEF_DEFAULT_UMASK	022
--- a/lib/getlong.c
+++ b/lib/getlong.c
@@ -1,36 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2007 - 2009, Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include <stdlib.h>
-#include <errno.h>
-#include "prototypes.h"
-
-/*
- * getlong - extract a long integer provided by the numstr string in *result
- *
- * It supports decimal, hexadecimal or octal representations.
- *
- * Returns 0 on failure, 1 on success.
- */
-int getlong (const char *numstr, /*@out@*/long int *result)
-{
-	long val;
-	char *endptr;
-
-	errno = 0;
-	val = strtol (numstr, &endptr, 0);
-	if (('\0' == *numstr) || ('\0' != *endptr) || (ERANGE == errno)) {
-		return 0;
-	}
-
-	*result = val;
-	return 1;
-}
-
--- a/lib/getulong.c
+++ b/lib/getulong.c
@@ -1,39 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2007 - 2009, Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id: getlong.c 2763 2009-04-23 09:57:03Z nekral-guest $"
-
-#include <stdlib.h>
-#include <errno.h>
-#include "prototypes.h"
-
-/*
- * getulong - extract an unsigned long integer provided by the numstr string in *result
- *
- * It supports decimal, hexadecimal or octal representations.
- *
- * Returns 0 on failure, 1 on success.
- */
-int getulong (const char *numstr, /*@out@*/unsigned long int *result)
-{
-	unsigned long int val;
-	char *endptr;
-
-	errno = 0;
-	val = strtoul (numstr, &endptr, 0);
-	if (    ('\0' == *numstr)
-	     || ('\0' != *endptr)
-	     || (ERANGE == errno)
-	   ) {
-		return 0;
-	}
-
-	*result = val;
-	return 1;
-}
-
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -1,45 +1,71 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001       , Michał Moskal
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2010, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001       , Michał Moskal
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2007 - 2008, Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>

 #ident "$Id$"

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

-#include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "commonio.h"
 #include "getdef.h"
 #include "groupio.h"

-static /*@null@*/struct commonio_entry *merge_group_entries (
-	/*@null@*/ /*@returned@*/struct commonio_entry *gr1,
-	/*@null@*/struct commonio_entry *gr2);
+static struct commonio_entry *merge_group_entries (struct commonio_entry *gr1,
+                                                   struct commonio_entry *gr2);
 static int split_groups (unsigned int max_members);
 static int group_open_hook (void);

-static /*@null@*/ /*@only@*/void *group_dup (const void *ent)
+static void *group_dup (const void *ent)
 {
 	const struct group *gr = ent;

 	return __gr_dup (gr);
 }

-static void group_free (/*@out@*/ /*@only@*/void *ent)
+static void group_free (void *ent)
 {
 	struct group *gr = ent;

-	gr_free (gr);
+	free (gr->gr_name);
+	free (gr->gr_passwd);
+	while (*(gr->gr_mem)) {
+		free (*(gr->gr_mem));
+		gr->gr_mem++;
+	}
+	free (gr);
 }

 static const char *group_getname (const void *ent)
@@ -51,30 +77,13 @@ static const char *group_getname (const void *ent)

 static void *group_parse (const char *line)
 {
-	return sgetgrent (line);
+	return (void *) sgetgrent (line);
 }

 static int group_put (const void *ent, FILE * file)
 {
 	const struct group *gr = ent;

-	if (   (NULL == gr)
-	    || (valid_field (gr->gr_name, ":\n") == -1)
-	    || (valid_field (gr->gr_passwd, ":\n") == -1)
-	    || (gr->gr_gid == (gid_t)-1)) {
-		return -1;
-	}
-
-	/* FIXME: fail also if gr->gr_mem == NULL ?*/
-	if (NULL != gr->gr_mem) {
-		size_t i;
-		for (i = 0; NULL != gr->gr_mem[i]; i++) {
-			if (valid_field (gr->gr_mem[i], ",:\n") == -1) {
-				return -1;
-			}
-		}
-	}
-
 	return (putgrent (gr, file) == -1) ? -1 : 0;
 }

@@ -82,9 +91,8 @@ static int group_close_hook (void)
 {
 	unsigned int max_members = getdef_unum("MAX_MEMBERS_PER_GROUP", 0);

-	if (0 == max_members) {
+	if (0 == max_members)
 		return 1;
-	}

 	return split_groups (max_members);
 }
@@ -101,36 +109,27 @@ static struct commonio_ops group_ops = {
 	group_close_hook
 };

-static /*@owned@*/struct commonio_db group_db = {
+static struct commonio_db group_db = {
 	GROUP_FILE,		/* filename */
 	&group_ops,		/* ops */
 	NULL,			/* fp */
 #ifdef WITH_SELINUX
 	NULL,			/* scontext */
 #endif
-	0644,                   /* st_mode */
-	0,                      /* st_uid */
-	0,                      /* st_gid */
 	NULL,			/* head */
 	NULL,			/* tail */
 	NULL,			/* cursor */
-	false,			/* changed */
-	false,			/* isopen */
-	false,			/* locked */
-	false,			/* readonly */
-	false			/* setname */
+	0,			/* changed */
+	0,			/* isopen */
+	0,			/* locked */
+	0			/* readonly */
 };

-int gr_setdbname (const char *filename)
+int gr_name (const char *filename)
 {
 	return commonio_setname (&group_db, filename);
 }

-/*@observer@*/const char *gr_dbname (void)
-{
-	return group_db.filename;
-}
-
 int gr_lock (void)
 {
 	return commonio_lock (&group_db);
@@ -141,12 +140,12 @@ int gr_open (int mode)
 	return commonio_open (&group_db, mode);
 }

-/*@observer@*/ /*@null@*/const struct group *gr_locate (const char *name)
+const struct group *gr_locate (const char *name)
 {
 	return commonio_locate (&group_db, name);
 }

-/*@observer@*/ /*@null@*/const struct group *gr_locate_gid (gid_t gid)
+const struct group *gr_locate_gid (gid_t gid)
 {
 	const struct group *grp;

@@ -160,7 +159,7 @@ int gr_open (int mode)

 int gr_update (const struct group *gr)
 {
-	return commonio_update (&group_db, gr);
+	return commonio_update (&group_db, (const void *) gr);
 }

 int gr_remove (const char *name)
@@ -173,7 +172,7 @@ int gr_rewind (void)
 	return commonio_rewind (&group_db);
 }

-/*@observer@*/ /*@null@*/const struct group *gr_next (void)
+const struct group *gr_next (void)
 {
 	return commonio_next (&group_db);
 }
@@ -190,15 +189,15 @@ int gr_unlock (void)

 void __gr_set_changed (void)
 {
-	group_db.changed = true;
+	group_db.changed = 1;
 }

-/*@dependent@*/ /*@null@*/struct commonio_entry *__gr_get_head (void)
+struct commonio_entry *__gr_get_head (void)
 {
 	return group_db.head;
 }

-/*@observer@*/const struct commonio_db *__gr_get_db (void)
+struct commonio_db *__gr_get_db (void)
 {
 	return &group_db;
 }
@@ -212,23 +211,20 @@ static int gr_cmp (const void *p1, const void *p2)
 {
 	gid_t u1, u2;

-	if ((*(struct commonio_entry **) p1)->eptr == NULL) {
+	if ((*(struct commonio_entry **) p1)->eptr == NULL)
 		return 1;
-	}
-	if ((*(struct commonio_entry **) p2)->eptr == NULL) {
+	if ((*(struct commonio_entry **) p2)->eptr == NULL)
 		return -1;
-	}

 	u1 = ((struct group *) (*(struct commonio_entry **) p1)->eptr)->gr_gid;
 	u2 = ((struct group *) (*(struct commonio_entry **) p2)->eptr)->gr_gid;

-	if (u1 < u2) {
+	if (u1 < u2)
 		return -1;
-	} else if (u1 > u2) {
+	else if (u1 > u2)
 		return 1;
-	} else {
+	else
 		return 0;
-	}
 }

 /* Sort entries by GID */
@@ -242,14 +238,13 @@ static int group_open_hook (void)
 	unsigned int max_members = getdef_unum("MAX_MEMBERS_PER_GROUP", 0);
 	struct commonio_entry *gr1, *gr2;

-	if (0 == max_members) {
+	if (0 == max_members)
 		return 1;
-	}

-	for (gr1 = group_db.head; NULL != gr1; gr1 = gr1->next) {
-		for (gr2 = gr1->next; NULL != gr2; gr2 = gr2->next) {
-			struct group *g1 = gr1->eptr;
-			struct group *g2 = gr2->eptr;
+	for (gr1 = group_db.head; gr1; gr1 = gr1->next) {
+		for (gr2 = gr1->next; gr2; gr2 = gr2->next) {
+			struct group *g1 = (struct group *)gr1->eptr;
+			struct group *g2 = (struct group *)gr2->eptr;
 			if (NULL != g1 &&
 			    NULL != g2 &&
 			    0 == strcmp (g1->gr_name, g2->gr_name) &&
@@ -262,15 +257,11 @@ static int group_open_hook (void)
 				if (NULL == gr1)
 					return 0;
 				/* Unlink gr2 */
-				if (NULL != gr2->next) {
+				if (NULL != gr2->next)
 					gr2->next->prev = gr2->prev;
-				}
-				/* gr2 does not start with head */
-				assert (NULL != gr2->prev);
 				gr2->prev->next = gr2->next;
 			}
 		}
-		assert (NULL != gr1);
 	}

 	return 1;
@@ -288,23 +279,22 @@ static int group_open_hook (void)
 * the modified first entry on success, or NULL on failure (with errno
 * set).
 */
-static /*@null@*/struct commonio_entry *merge_group_entries (
-	/*@null@*/ /*@returned@*/struct commonio_entry *gr1,
-	/*@null@*/struct commonio_entry *gr2)
+static struct commonio_entry *merge_group_entries (struct commonio_entry *gr1,
+                                                   struct commonio_entry *gr2)
 {
 	struct group *gptr1;
 	struct group *gptr2;
 	char **new_members;
-	size_t members = 0;
+	int members = 0;
 	char *new_line;
-	size_t new_line_len, i;
+	int new_line_len, i;
 	if (NULL == gr2 || NULL == gr1) {
 		errno = EINVAL;
 		return NULL;
 	}

-	gptr1 = gr1->eptr;
-	gptr2 = gr2->eptr;
+	gptr1 = (struct group *)gr1->eptr;
+	gptr2 = (struct group *)gr2->eptr;
 	if (NULL == gptr2 || NULL == gptr1) {
 		errno = EINVAL;
 		return NULL;
@@ -312,11 +302,13 @@ static /*@null@*/struct commonio_entry *merge_group_entries (

 	/* Concatenate the 2 lines */
 	new_line_len = strlen (gr1->line) + strlen (gr2->line) +1;
-	new_line = MALLOC(new_line_len + 1, char);
+	new_line = (char *)malloc ((new_line_len + 1) * sizeof(char*));
 	if (NULL == new_line) {
+		errno = ENOMEM;
 		return NULL;
 	}
-	snprintf(new_line, new_line_len + 1, "%s\n%s", gr1->line, gr2->line);
+	snprintf(new_line, new_line_len, "%s\n%s", gr1->line, gr2->line);
+	new_line[new_line_len] = '\0';

 	/* Concatenate the 2 list of members */
 	for (i=0; NULL != gptr1->gr_mem[i]; i++);
@@ -324,37 +316,30 @@ static /*@null@*/struct commonio_entry *merge_group_entries (
 	for (i=0; NULL != gptr2->gr_mem[i]; i++) {
 		char **pmember = gptr1->gr_mem;
 		while (NULL != *pmember) {
-			if (0 == strcmp(*pmember, gptr2->gr_mem[i])) {
+			if (0 == strcmp(*pmember, gptr2->gr_mem[i]))
 				break;
-			}
 			pmember++;
 		}
-		if (NULL == *pmember) {
+		if (NULL == *pmember)
 			members++;
-		}
 	}
-	new_members = CALLOC (members + 1, char *);
+	new_members = (char **)malloc ( (members+1) * sizeof(char*) );
 	if (NULL == new_members) {
-		free (new_line);
+		errno = ENOMEM;
 		return NULL;
 	}
-	for (i=0; NULL != gptr1->gr_mem[i]; i++) {
+	for (i=0; NULL != gptr1->gr_mem[i]; i++)
 		new_members[i] = gptr1->gr_mem[i];
-	}
-	/* NULL termination enforced by above calloc */
-
 	members = i;
 	for (i=0; NULL != gptr2->gr_mem[i]; i++) {
 		char **pmember = new_members;
 		while (NULL != *pmember) {
-			if (0 == strcmp(*pmember, gptr2->gr_mem[i])) {
+			if (0 == strcmp(*pmember, gptr2->gr_mem[i]))
 				break;
-			}
 			pmember++;
 		}
 		if (NULL == *pmember) {
-			new_members[members] = gptr2->gr_mem[i];
-			members++;
+			new_members[members++] = gptr2->gr_mem[i];
 			new_members[members] = NULL;
 		}
 	}
@@ -375,55 +360,39 @@ static int split_groups (unsigned int max_members)
 {
 	struct commonio_entry *gr;

-	for (gr = group_db.head; NULL != gr; gr = gr->next) {
-		struct group *gptr = gr->eptr;
+	for (gr = group_db.head; gr; gr = gr->next) {
+		struct group *gptr = (struct group *)gr->eptr;
 		struct commonio_entry *new;
 		struct group *new_gptr;
 		unsigned int members = 0;
-		unsigned int i;

 		/* Check if this group must be split */
-		if (!gr->changed) {
+		if (!gr->changed)
 			continue;
-		}
-		if (NULL == gptr) {
+		if (NULL == gptr)
 			continue;
-		}
 		for (members = 0; NULL != gptr->gr_mem[members]; members++);
-		if (members <= max_members) {
+		if (members <= max_members)
 			continue;
-		}

-		new = MALLOC(1, struct commonio_entry);
+		new = (struct commonio_entry *) malloc (sizeof *new);
 		if (NULL == new) {
+			errno = ENOMEM;
 			return 0;
 		}
 		new->eptr = group_dup(gr->eptr);
 		if (NULL == new->eptr) {
-			free (new);
 			errno = ENOMEM;
 			return 0;
 		}
-		new_gptr = new->eptr;
+		new_gptr = (struct group *)new->eptr;
 		new->line = NULL;
-		new->changed = true;
+		new->changed = 1;

 		/* Enforce the maximum number of members on gptr */
-		for (i = max_members; NULL != gptr->gr_mem[i]; i++) {
-			free (gptr->gr_mem[i]);
-			gptr->gr_mem[i] = NULL;
-		}
-		/* Shift all the members */
+		gptr->gr_mem[max_members] = NULL;
 		/* The number of members in new_gptr will be check later */
-		for (i = 0; NULL != new_gptr->gr_mem[i + max_members]; i++) {
-			free (new_gptr->gr_mem[i]);
-			new_gptr->gr_mem[i] = new_gptr->gr_mem[i + max_members];
-			new_gptr->gr_mem[i + max_members] = NULL;
-		}
-		for (; NULL != new_gptr->gr_mem[i]; i++) {
-			free (new_gptr->gr_mem[i]);
-			new_gptr->gr_mem[i] = NULL;
-		}
+		new_gptr->gr_mem = &new_gptr->gr_mem[max_members];

 		/* insert the new entry in the list */
 		new->prev = gr;
--- a/lib/groupio.h
+++ b/lib/groupio.h
@@ -1,32 +1,47 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001       , Michał Moskal
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001       , Michał Moskal
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-/* $Id$ */
-#ifndef _GROUPIO_H
-#define _GROUPIO_H
-
-#include <sys/types.h>
 #include <grp.h>
-
 extern int gr_close (void);
-extern /*@observer@*/ /*@null@*/const struct group *gr_locate (const char *name);
-extern /*@observer@*/ /*@null@*/const struct group *gr_locate_gid (gid_t gid);
+extern const struct group *gr_locate (const char *);
+extern const struct group *gr_locate_gid (gid_t gid);
 extern int gr_lock (void);
-extern int gr_setdbname (const char *filename);
-extern /*@observer@*/const char *gr_dbname (void);
-extern /*@observer@*/ /*@null@*/const struct group *gr_next (void);
-extern int gr_open (int mode);
-extern int gr_remove (const char *name);
+extern int gr_name (const char *);
+extern const struct group *gr_next (void);
+extern int gr_open (int);
+extern int gr_remove (const char *);
 extern int gr_rewind (void);
 extern int gr_unlock (void);
-extern int gr_update (const struct group *gr);
+extern int gr_update (const struct group *);
 extern int gr_sort (void);

-#endif
--- a/lib/groupmem.c
+++ b/lib/groupmem.c
@@ -1,89 +1,67 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001       , Michał Moskal
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2013, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001       , Michał Moskal
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2007       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>

 #ident "$Id$"

-#include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "groupio.h"

-/*@null@*/ /*@only@*/struct group *__gr_dup (const struct group *grent)
+struct group *__gr_dup (const struct group *grent)
 {
 	struct group *gr;
 	int i;

-	gr = MALLOC(1, struct group);
-	if (NULL == gr) {
+	if (!(gr = (struct group *) malloc (sizeof *gr)))
 		return NULL;
-	}
-	/* The libc might define other fields. They won't be copied. */
-	memset (gr, 0, sizeof *gr);
-	gr->gr_gid = grent->gr_gid;
-	/*@-mustfreeonly@*/
-	gr->gr_name = strdup (grent->gr_name);
-	/*@=mustfreeonly@*/
-	if (NULL == gr->gr_name) {
-		gr_free(gr);
+	*gr = *grent;
+	if (!(gr->gr_name = strdup (grent->gr_name)))
 		return NULL;
-	}
-	/*@-mustfreeonly@*/
-	gr->gr_passwd = strdup (grent->gr_passwd);
-	/*@=mustfreeonly@*/
-	if (NULL == gr->gr_passwd) {
-		gr_free(gr);
+	if (!(gr->gr_passwd = strdup (grent->gr_passwd)))
 		return NULL;
-	}

 	for (i = 0; grent->gr_mem[i]; i++);
-
-	/*@-mustfreeonly@*/
-	gr->gr_mem = MALLOC(i + 1, char *);
-	/*@=mustfreeonly@*/
-	if (NULL == gr->gr_mem) {
-		gr_free(gr);
+	gr->gr_mem = (char **) malloc ((i + 1) * sizeof (char *));
+	if (!gr->gr_mem)
 		return NULL;
-	}
 	for (i = 0; grent->gr_mem[i]; i++) {
 		gr->gr_mem[i] = strdup (grent->gr_mem[i]);
-		if (NULL == gr->gr_mem[i]) {
-			gr_free(gr);
+		if (!gr->gr_mem[i])
 			return NULL;
-		}
 	}
 	gr->gr_mem[i] = NULL;
-
 	return gr;
 }

-void gr_free_members (struct group *grent)
-{
-	if (NULL != grent->gr_mem) {
-		size_t i;
-		for (i = 0; NULL != grent->gr_mem[i]; i++) {
-			free (grent->gr_mem[i]);
-		}
-		free (grent->gr_mem);
-		grent->gr_mem = NULL;
-	}
-}
-
-void gr_free (/*@out@*/ /*@only@*/struct group *grent)
-{
-	free (grent->gr_name);
-	if (NULL != grent->gr_passwd) {
-		strzero (grent->gr_passwd);
-		free (grent->gr_passwd);
-	}
-	gr_free_members(grent);
-	free (grent);
-}
--- a/lib/gshadow.c
+++ b/lib/gshadow.c
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008 - 2009, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1998, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -15,26 +38,23 @@
 #ident "$Id$"

 #include <stdio.h>
-#include <string.h>
-
-#include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
-
-static /*@null@*/FILE *shadow;
-static /*@null@*//*@only@*/char **members = NULL;
+static FILE *shadow;
+static char sgrbuf[BUFSIZ * 4];
+static char **members = NULL;
 static size_t nmembers = 0;
-static /*@null@*//*@only@*/char **admins = NULL;
+static char **admins = NULL;
 static size_t nadmins = 0;
 static struct sgrp sgroup;

 #define	FIELDS	4

 #ifdef	USE_NIS
-static bool nis_used;
-static bool nis_ignore;
+static int nis_used;
+static int nis_ignore;
 static enum { native, start, middle, native2 } nis_state;
-static bool nis_bound;
+static int nis_bound;
 static char *nis_domain;
 static char *nis_key;
 static int nis_keylen;
@@ -45,6 +65,19 @@ static int nis_vallen;
 #endif

 #ifdef	USE_NIS
+
+/*
+ * __setsgNIS - turn on or off NIS searches
+ */
+
+void __setsgNIS (int flag)
+{
+	nis_ignore = !flag;
+
+	if (nis_ignore)
+		nis_used = 0;
+}
+
 /*
 * bind_nis - bind to NIS server
 */
@@ -54,35 +87,29 @@ static int bind_nis (void)
 	if (yp_get_default_domain (&nis_domain))
 		return -1;

-	nis_bound = true;
+	nis_bound = 1;
 	return 0;
 }
 #endif

-static /*@null@*/char **build_list (char *s, char **list[], size_t * nlist)
+static char **build_list (char *s, char **list[], size_t * nlist)
 {
 	char **ptr = *list;
 	size_t nelem = *nlist, size;

 	while (s != NULL && *s != '\0') {
 		size = (nelem + 1) * sizeof (ptr);
-		ptr = REALLOC(*list, size, char *);
-		if (NULL != ptr) {
-			ptr[nelem] = s;
-			nelem++;
+		if ((ptr = realloc (*list, size)) != NULL) {
+			ptr[nelem++] = s;
 			*list = ptr;
 			*nlist = nelem;
-			s = strchr (s, ',');
-			if (NULL != s) {
-				*s = '\0';
-				s++;
-			}
+			if ((s = strchr (s, ',')))
+				*s++ = '\0';
 		}
 	}
 	size = (nelem + 1) * sizeof (ptr);
-	ptr = REALLOC(*list, size, char *);
-	if (NULL != ptr) {
-		ptr[nelem] = NULL;
+	if ((ptr = realloc (*list, size)) != NULL) {
+		ptr[nelem] = '\0';
 		*list = ptr;
 	}
 	return ptr;
@@ -93,59 +120,41 @@ void setsgent (void)
 #ifdef	USE_NIS
 	nis_state = native;
 #endif
-	if (NULL != shadow) {
+	if (shadow)
 		rewind (shadow);
-	} else {
+	else
 		shadow = fopen (SGROUP_FILE, "r");
-	}
 }

 void endsgent (void)
 {
-	if (NULL != shadow) {
+	if (shadow)
 		(void) fclose (shadow);
-	}

-	shadow = NULL;
+	shadow = (FILE *) 0;
 }

-/*@observer@*//*@null@*/struct sgrp *sgetsgent (const char *string)
+struct sgrp *sgetsgent (const char *string)
 {
-	static char *sgrbuf = NULL;
-	static size_t sgrbuflen = 0;
-
 	char *fields[FIELDS];
 	char *cp;
 	int i;
-	size_t len = strlen (string) + 1;

-	if (len > sgrbuflen) {
-		char *buf = REALLOC(sgrbuf, len, char);
-		if (NULL == buf) {
-			return NULL;
-		}
-		sgrbuf = buf;
-		sgrbuflen = len;
-	}
+	strncpy (sgrbuf, string, (int) sizeof sgrbuf - 1);
+	sgrbuf[sizeof sgrbuf - 1] = '\0';

-	strcpy (sgrbuf, string);
-
-	cp = strrchr (sgrbuf, '\n');
-	if (NULL != cp) {
+	if ((cp = strrchr (sgrbuf, '\n')))
 		*cp = '\0';
-	}

 	/*
 	 * There should be exactly 4 colon separated fields.  Find
 	 * all 4 of them and save the starting addresses in fields[].
 	 */

-	for (cp = sgrbuf, i = 0; (i < FIELDS) && (NULL != cp); i++) {
+	for (cp = sgrbuf, i = 0; i < FIELDS && cp; i++) {
 		fields[i] = cp;
-		cp = strchr (cp, ':');
-		if (NULL != cp) {
+		if ((cp = strchr (cp, ':')))
 			*cp++ = '\0';
-		}
 	}

 	/*
@@ -153,26 +162,24 @@ void endsgent (void)
 	 * the line is invalid.
 	 */

-	if ((NULL != cp) || (i != FIELDS)) {
+	if (cp || i != FIELDS)
 #ifdef	USE_NIS
-		if (!IS_NISCHAR (fields[0][0])) {
+		if (!IS_NISCHAR (fields[0][0]))
 			return 0;
-		} else {
-			nis_used = true;
-		}
+		else
+			nis_used = 1;
 #else
 		return 0;
 #endif
-	}

 	sgroup.sg_name = fields[0];
 	sgroup.sg_passwd = fields[1];
-	if (0 != nadmins) {
+	if (nadmins) {
 		nadmins = 0;
 		free (admins);
 		admins = NULL;
 	}
-	if (0 != nmembers) {
+	if (nmembers) {
 		nmembers = 0;
 		free (members);
 		members = NULL;
@@ -190,76 +197,44 @@ void endsgent (void)
 * converts it to a (struct sgrp).  NULL is returned on EOF.
 */

-/*@observer@*//*@null@*/struct sgrp *fgetsgent (/*@null@*/FILE * fp)
+struct sgrp *fgetsgent (FILE * fp)
 {
-	static size_t buflen = 0;
-	static char *buf = NULL;
-
+	char buf[sizeof sgrbuf];
 	char *cp;

-	if (0 == buflen) {
-		buf = MALLOC(BUFSIZ, char);
-		if (NULL == buf) {
-			return NULL;
-		}
-		buflen = BUFSIZ;
-	}
-
-	if (NULL == fp) {
-		return NULL;
-	}
+	if (!fp)
+		return (0);

 #ifdef	USE_NIS
-	while (fgetsx (buf, buflen, fp) == buf)
+	while (fgetsx (buf, sizeof buf, fp) != (char *) 0)
 #else
-	if (fgetsx (buf, buflen, fp) == buf)
+	if (fgetsx (buf, sizeof buf, fp) != (char *) 0)
 #endif
 	{
-		while (   ((cp = strrchr (buf, '\n')) == NULL)
-		       && (feof (fp) == 0)) {
-			size_t len;
-
-			cp = REALLOC(buf, buflen * 2, char);
-			if (NULL == cp) {
-				return NULL;
-			}
-			buf = cp;
-			buflen *= 2;
-
-			len = strlen (buf);
-			if (fgetsx (&buf[len],
-			            (int) (buflen - len),
-			            fp) != &buf[len]) {
-				return NULL;
-			}
-		}
-		cp = strrchr (buf, '\n');
-		if (NULL != cp) {
+		if ((cp = strchr (buf, '\n')))
 			*cp = '\0';
-		}
 #ifdef	USE_NIS
-		if (nis_ignore && IS_NISCHAR (buf[0])) {
+		if (nis_ignore && IS_NISCHAR (buf[0]))
 			continue;
-		}
 #endif
 		return (sgetsgent (buf));
 	}
-	return NULL;
+	return 0;
 }

 /*
 * getsgent - get a single shadow group entry
 */

-/*@observer@*//*@null@*/struct sgrp *getsgent (void)
+struct sgrp *getsgent (void)
 {
 #ifdef	USE_NIS
-	bool nis_1_group = false;
+	int nis_1_group = 0;
 	struct sgrp *val;
+	char buf[BUFSIZ];
 #endif
-	if (NULL == shadow) {
+	if (!shadow)
 		setsgent ();
-	}

 #ifdef	USE_NIS
      again:
@@ -274,10 +249,8 @@ void endsgent (void)
 		 * NULL right away if there is none.
 		 */

-		val = fgetsgent (shadow);
-		if (NULL == val) {
+		if (!(val = fgetsgent (shadow)))
 			return 0;
-		}

 		/*
 		 * If this entry began with a NIS escape character, we have
@@ -286,11 +259,10 @@ void endsgent (void)
 		 */

 		if (IS_NISCHAR (val->sg_name[0])) {
-			if ('\0' != val->sg_name[1]) {
-				nis_1_group = true;
-			} else {
+			if (val->sg_name[1])
+				nis_1_group = 1;
+			else
 				nis_state = start;
-			}
 		}

 		/*
@@ -298,18 +270,16 @@ void endsgent (void)
 		 * use a NIS map, it must be a regular local group.
 		 */

-		if (!nis_1_group && (nis_state != start)) {
+		if (nis_1_group == 0 && nis_state != start)
 			return val;
-		}

 		/*
 		 * If this is an escape to use an NIS map, switch over to
 		 * that bunch of code.
 		 */

-		if (nis_state == start) {
+		if (nis_state == start)
 			goto again;
-		}

 		/*
 		 * NEEDSWORK.  Here we substitute pieces-parts of this entry.
@@ -317,7 +287,7 @@ void endsgent (void)

 		return 0;
 	} else {
-		if (!nis_bound) {
+		if (nis_bound == 0) {
 			if (bind_nis ()) {
 				nis_state = native2;
 				goto again;
@@ -349,11 +319,12 @@ void endsgent (void)
 * getsgnam - get a shadow group entry by name
 */

-/*@observer@*//*@null@*/struct sgrp *getsgnam (const char *name)
+struct sgrp *getsgnam (const char *name)
 {
 	struct sgrp *sgrp;

 #ifdef	USE_NIS
+	char buf[BUFSIZ];
 	static char save_name[16];
 	int nis_disabled = 0;
 #endif
@@ -368,9 +339,8 @@ void endsgent (void)
 		 * Search the gshadow.byname map for this group.
 		 */

-		if (!nis_bound) {
+		if (!nis_bound)
 			bind_nis ();
-		}

 		if (nis_bound) {
 			char *cp;
@@ -378,14 +348,11 @@ void endsgent (void)
 			if (yp_match (nis_domain, "gshadow.byname", name,
 				      strlen (name), &nis_val,
 				      &nis_vallen) == 0) {
-				cp = strchr (nis_val, '\n');
-				if (NULL != cp) {
+				if (cp = strchr (nis_val, '\n'))
 					*cp = '\0';
-				}

 				nis_state = middle;
-				sgrp = sgetsgent (nis_val);
-				if (NULL != sgrp) {
+				if (sgrp = sgetsgent (nis_val)) {
 					strcpy (save_name, sgrp->sg_name);
 					nis_key = save_name;
 					nis_keylen = strlen (save_name);
@@ -398,19 +365,20 @@ void endsgent (void)
 #endif
 #ifdef	USE_NIS
 	if (nis_used) {
-		nis_ignore = true;
-		nis_disabled = true;
+		nis_ignore++;
+		nis_disabled++;
 	}
 #endif
-	while ((sgrp = getsgent ()) != NULL) {
-		if (strcmp (name, sgrp->sg_name) == 0) {
+	while ((sgrp = getsgent ()) != (struct sgrp *) 0) {
+		if (strcmp (name, sgrp->sg_name) == 0)
 			break;
-		}
 	}
 #ifdef	USE_NIS
-	nis_ignore = false;
+	nis_ignore--;
 #endif
-	return sgrp;
+	if (sgrp)
+		return sgrp;
+	return (0);
 }

 /*
@@ -427,23 +395,19 @@ int putsgent (const struct sgrp *sgrp, FILE * fp)
 	int i;
 	size_t size;

-	if ((NULL == fp) || (NULL == sgrp)) {
+	if (!fp || !sgrp)
 		return -1;
-	}

 	/* calculate the required buffer size */
 	size = strlen (sgrp->sg_name) + strlen (sgrp->sg_passwd) + 10;
-	for (i = 0; (NULL != sgrp->sg_adm) && (NULL != sgrp->sg_adm[i]); i++) {
+	for (i = 0; sgrp->sg_adm && sgrp->sg_adm[i]; i++)
 		size += strlen (sgrp->sg_adm[i]) + 1;
-	}
-	for (i = 0; (NULL != sgrp->sg_mem) && (NULL != sgrp->sg_mem[i]); i++) {
+	for (i = 0; sgrp->sg_mem && sgrp->sg_mem[i]; i++)
 		size += strlen (sgrp->sg_mem[i]) + 1;
-	}

-	buf = MALLOC(size, char);
-	if (NULL == buf) {
+	buf = malloc (size);
+	if (!buf)
 		return -1;
-	}
 	cp = buf;

 	/*
@@ -463,32 +427,27 @@ int putsgent (const struct sgrp *sgrp, FILE * fp)
 	 * with a ",".
 	 */

-	for (i = 0; NULL != sgrp->sg_adm[i]; i++) {
-		if (i > 0) {
+	for (i = 0; sgrp->sg_adm[i]; i++) {
+		if (i > 0)
 			*cp++ = ',';
-		}

 		strcpy (cp, sgrp->sg_adm[i]);
 		cp += strlen (cp);
 	}
-	*cp = ':';
-	cp++;
+	*cp++ = ':';

 	/*
 	 * Now do likewise with the group members.
 	 */

-	for (i = 0; NULL != sgrp->sg_mem[i]; i++) {
-		if (i > 0) {
-			*cp = ',';
-			cp++;
-		}
+	for (i = 0; sgrp->sg_mem[i]; i++) {
+		if (i > 0)
+			*cp++ = ',';

 		strcpy (cp, sgrp->sg_mem[i]);
 		cp += strlen (cp);
 	}
-	*cp = '\n';
-	cp++;
+	*cp++ = '\n';
 	*cp = '\0';

 	/*
@@ -505,5 +464,5 @@ int putsgent (const struct sgrp *sgrp, FILE * fp)
 	return 0;
 }
 #else
-extern int ISO_C_forbids_an_empty_translation_unit;
+extern int errno;		/* warning: ANSI C forbids an empty source file */
 #endif				/*} SHADOWGRP */
--- a/lib/gshadow_.h
+++ b/lib/gshadow_.h
@@ -1,9 +1,32 @@
 /*
- * SPDX-FileCopyrightText: 1988 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
+ * Copyright (c) 1988 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1997, Marek Michałkiewicz
+ * Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 /*
@@ -20,7 +43,7 @@
 struct sgrp {
 	char *sg_name;		/* group name */
 	char *sg_passwd;	/* group password */
-	char **sg_adm;		/* group administrator list */
+	char **sg_adm;		/* group administator list */
 	char **sg_mem;		/* group membership list */
 };

@@ -31,18 +54,18 @@ struct sgrp {
 #include <stdio.h>		/* for FILE */

 #if __STDC__
-/*@observer@*//*@null@*/struct sgrp *getsgent (void);
-/*@observer@*//*@null@*/struct sgrp *getsgnam (const char *);
-/*@observer@*//*@null@*/struct sgrp *sgetsgent (const char *);
-/*@observer@*//*@null@*/struct sgrp *fgetsgent (/*@null@*/FILE *);
+struct sgrp *getsgent (void);
+struct sgrp *getsgnam (const char *);
+struct sgrp *sgetsgent (const char *);
+struct sgrp *fgetsgent (FILE *);
 void setsgent (void);
 void endsgent (void);
 int putsgent (const struct sgrp *, FILE *);
 #else
-/*@observer@*//*@null@*/struct sgrp *getsgent ();
-/*@observer@*//*@null@*/struct sgrp *getsgnam ();
-/*@observer@*//*@null@*/struct sgrp *sgetsgent ();
-/*@observer@*//*@null@*/struct sgrp *fgetsgent ();
+struct sgrp *getsgent ();
+struct sgrp *getsgnam ();
+struct sgrp *sgetsgent ();
+struct sgrp *fgetsgent ();
 void setsgent ();
 void endsgent ();
 int putsgent ();
--- a/lib/lockpw.c
+++ b/lib/lockpw.c
@@ -1,9 +1,32 @@
 /*
- * SPDX-FileCopyrightText: 1992       , Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
+ * Copyright (c) 1992       , Julianne Frances Haugh
+ * Copyright (c) 1996 - 1998, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -81,5 +104,5 @@ int ulckpwdf (void)
 	return (pw_unlock () && spw_unlock ())? 0 : -1;
 }
 #else
-extern int ISO_C_forbids_an_empty_translation_unit;
+extern int errno;		/* warning: ANSI C forbids an empty source file */
 #endif
--- a/lib/mempcpy.h
+++ b/lib/mempcpy.h
@@ -1,31 +0,0 @@
-/*
- * SPDX-FileCopyrightText:  2023, Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
-
-
-#ifndef SHADOW_INCLUDE_LIB_MEMPCPY_H_
-#define SHADOW_INCLUDE_LIB_MEMPCPY_H_
-
-
-#include <config.h>
-
-#if !defined(HAVE_MEMPCPY)
-
-#include <stddef.h>
-#include <string.h>
-
-
-inline void *mempcpy(void *restrict dst, const void *restrict src, size_t n);
-
-
-inline void *
-mempcpy(void *restrict dst, const void *restrict src, size_t n)
-{
-	return memcpy(dst, src, n) + n;
-}
-
-
-#endif  // !HAVE_MEMPCPY
-#endif  // include guard
--- a/lib/nscd.c
+++ b/lib/nscd.c
@@ -1,58 +1,50 @@
 /* Author: Peter Vrabec <pvrabec@redhat.com> */

-#include <config.h>
-#ifdef USE_NSCD
+/* because of TEMP_FAILURE_RETRY */
+#define _GNU_SOURCE

+#include <features.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <spawn.h>
+#include <errno.h>
 #include <sys/wait.h>
 #include <sys/types.h>
-#include "exitcodes.h"
-#include "defines.h"
-#include "prototypes.h"
 #include "nscd.h"
-#include "shadowlog_internal.h"
-
-#define MSG_NSCD_FLUSH_CACHE_FAILED "%s: Failed to flush the nscd cache.\n"

 /*
 * nscd_flush_cache - flush specified service buffer in nscd cache
 */
 int nscd_flush_cache (const char *service)
 {
-	int status, code;
-	const char *cmd = "/usr/sbin/nscd";
-	const char *spawnedArgs[] = {"nscd", "-i", service, NULL};
-	const char *spawnedEnv[] = {NULL};
+	pid_t pid, termpid;
+	int err, status;
+	char *spawnedArgs[] = {"/usr/sbin/nscd", "nscd", "-i", service, NULL};
+	char *spawnedEnv[] = {NULL};

-	if (run_command (cmd, spawnedArgs, spawnedEnv, &status) != 0) {
-		/* run_command writes its own more detailed message. */
-		(void) fprintf (shadow_logfd, _(MSG_NSCD_FLUSH_CACHE_FAILED), shadow_progname);
+	/* spawn process */
+	if( (err=posix_spawn(&pid, spawnedArgs[0], NULL, NULL,
+			     spawnedArgs, spawnedEnv)) !=0 ) 
+	{
+		fprintf(stderr, "posix_spawn() error=%d\n", err);
 		return -1;
 	}

-	code = WEXITSTATUS (status);
-	if (!WIFEXITED (status)) {
-		(void) fprintf (shadow_logfd,
-		                _("%s: nscd did not terminate normally (signal %d)\n"),
-		                shadow_progname, WTERMSIG (status));
+	/* Wait for the spawned process to exit */	
+	termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0));
+	if (termpid == -1)
+	{
+		perror("waitpid");
 		return -1;
-	} else if (code == E_CMD_NOTFOUND) {
-		/* nscd is not installed, or it is installed but uses an
-		   interpreter that is missing.  Probably the former. */
-		return 0;
-	} else if (code == 1) {
-		/* nscd is installed, but it isn't active. */
-		return 0;
-	} else if (code != 0) {
-		(void) fprintf (shadow_logfd, _("%s: nscd exited with status %d\n"),
-		                shadow_progname, code);
-		(void) fprintf (shadow_logfd, _(MSG_NSCD_FLUSH_CACHE_FAILED), shadow_progname);
+	}
+	else if (termpid != pid)
+	{
+		fprintf(stderr, "waitpid returned %ld != %ld\n",
+			 (long int) termpid, (long int) pid);
 		return -1;
 	}

 	return 0;
 }
-#else				/* USE_NSCD */
-extern int ISO_C_forbids_an_empty_translation_unit;
-#endif				/* USE_NSCD */

--- a/lib/nscd.h
+++ b/lib/nscd.h
@@ -4,10 +4,6 @@
 /*
 * nscd_flush_cache - flush specified service buffer in nscd cache
 */
-#ifdef	USE_NSCD
 extern int nscd_flush_cache (const char *service);
-#else
-#define nscd_flush_cache(service) (0)
-#endif

 #endif
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1,151 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <stdbool.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-#include <stdatomic.h>
-
-#include "alloc.h"
-#include "prototypes.h"
-#include "../libsubid/subid.h"
-#include "shadowlog_internal.h"
-#include "shadowlog.h"
-
-#define NSSWITCH "/etc/nsswitch.conf"
-
-// NSS plugin handling for subids
-// If nsswitch has a line like
-//    subid: sssd
-// then sssd will be consulted for subids.  Unlike normal NSS dbs,
-// only one db is supported at a time.  That's open to debate, but
-// the subids are a pretty limited resource, and local files seem
-// bound to step on any other allocations leading to insecure
-// conditions.
-static atomic_flag nss_init_started;
-static atomic_bool nss_init_completed;
-
-static struct subid_nss_ops *subid_nss;
-
-bool nss_is_initialized() {
-	return atomic_load(&nss_init_completed);
-}
-
-static void nss_exit(void) {
-	if (nss_is_initialized() && subid_nss) {
-		dlclose(subid_nss->handle);
-		free(subid_nss);
-		subid_nss = NULL;
-	}
-}
-
-// nsswitch_path is an argument only to support testing.
-void nss_init(const char *nsswitch_path) {
-	FILE *nssfp = NULL;
-	char *line = NULL, *p, *token, *saveptr;
-	size_t len = 0;
-	FILE *shadow_logfd = log_get_logfd();
-	char libname[65];
-	void *h;
-
-	if (atomic_flag_test_and_set(&nss_init_started)) {
-		// Another thread has started nss_init, wait for it to complete
-		while (!atomic_load(&nss_init_completed))
-			usleep(100);
-		return;
-	}
-
-	if (!nsswitch_path)
-		nsswitch_path = NSSWITCH;
-
-	// read nsswitch.conf to check for a line like:
-	//   subid:	files
-	nssfp = fopen(nsswitch_path, "r");
-	if (!nssfp) {
-		if (errno != ENOENT)
-			fprintf(shadow_logfd, "Failed opening %s: %m\n", nsswitch_path);
-
-		atomic_store(&nss_init_completed, true);
-		return;
-	}
-	p = NULL;
-	while (getline(&line, &len, nssfp) != -1) {
-		if (line[0] == '#')
-			continue;
-		if (strlen(line) < 8)
-			continue;
-		if (strncasecmp(line, "subid:", 6) != 0)
-			continue;
-		p = &line[6];
-		while (isspace(*p))
-			p++;
-		if (*p != '\0')
-			break;
-		p = NULL;
-	}
-	if (p == NULL) {
-		goto null_subid;
-	}
-	token = strtok_r(p, " \n\t", &saveptr);
-	if (token == NULL) {
-		fprintf(shadow_logfd, "No usable subid NSS module found, using files\n");
-		// subid_nss has to be null here, but to ease reviews:
-		goto null_subid;
-	}
-	if (strcmp(token, "files") == 0) {
-		goto null_subid;
-	}
-	if (strlen(token) > 50) {
-		fprintf(shadow_logfd, "Subid NSS module name too long (longer than 50 characters): %s\n", token);
-		fprintf(shadow_logfd, "Using files\n");
-		goto null_subid;
-	}
-	snprintf(libname, 64,  "libsubid_%s.so", token);
-	h = dlopen(libname, RTLD_LAZY);
-	if (!h) {
-		fprintf(shadow_logfd, "Error opening %s: %s\n", libname, dlerror());
-		fprintf(shadow_logfd, "Using files\n");
-		goto null_subid;
-	}
-	subid_nss = MALLOC(1, struct subid_nss_ops);
-	if (!subid_nss) {
-		goto close_lib;
-	}
-	subid_nss->has_range = dlsym(h, "shadow_subid_has_range");
-	if (!subid_nss->has_range) {
-		fprintf(shadow_logfd, "%s did not provide @has_range@\n", libname);
-		goto close_lib;
-	}
-	subid_nss->list_owner_ranges = dlsym(h, "shadow_subid_list_owner_ranges");
-	if (!subid_nss->list_owner_ranges) {
-		fprintf(shadow_logfd, "%s did not provide @list_owner_ranges@\n", libname);
-		goto close_lib;
-	}
-	subid_nss->find_subid_owners = dlsym(h, "shadow_subid_find_subid_owners");
-	if (!subid_nss->find_subid_owners) {
-		fprintf(shadow_logfd, "%s did not provide @find_subid_owners@\n", libname);
-		goto close_lib;
-	}
-	subid_nss->handle = h;
-	goto done;
-
-close_lib:
-	dlclose(h);
-	free(subid_nss);
-null_subid:
-	subid_nss = NULL;
-
-done:
-	atomic_store(&nss_init_completed, true);
-	free(line);
-	if (nssfp) {
-		atexit(nss_exit);
-		fclose(nssfp);
-	}
-}
-
-struct subid_nss_ops *get_subid_nss_handle() {
-	nss_init(NULL);
-	return subid_nss;
-}
--- a/lib/pam_defs.h
+++ b/lib/pam_defs.h
@@ -1,35 +1,51 @@
 /*
- * SPDX-FileCopyrightText: 1999       , Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001 - 2005, Tomasz Kłoczko
+ * Copyright (c) 1999       , Marek Michałkiewicz
+ * Copyright (c) 2001 - 2005, Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <config.h>
 #include <security/pam_appl.h>
-#ifdef HAVE_SECURITY_PAM_MISC_H
-# include <security/pam_misc.h>
-#endif
-#ifdef HAVE_SECURITY_OPENPAM_H
-# include <security/openpam.h>
-#endif
+#include <security/pam_misc.h>

-
-static const struct pam_conv conv = {
-	SHADOW_PAM_CONVERSATION,
+static struct pam_conv conv = {
+	misc_conv,
 	NULL
 };

 /* compatibility with different versions of Linux-PAM */
-#if !HAVE_DECL_PAM_ESTABLISH_CRED
+#ifndef PAM_ESTABLISH_CRED
 #define PAM_ESTABLISH_CRED PAM_CRED_ESTABLISH
 #endif
-#if !HAVE_DECL_PAM_DELETE_CRED
+#ifndef PAM_DELETE_CRED
 #define PAM_DELETE_CRED PAM_CRED_DELETE
 #endif
-#if !HAVE_DECL_PAM_NEW_AUTHTOK_REQD
+#ifndef PAM_NEW_AUTHTOK_REQD
 #define PAM_NEW_AUTHTOK_REQD PAM_AUTHTOKEN_REQD
 #endif
-#if !HAVE_DECL_PAM_DATA_SILENT
+#ifndef PAM_DATA_SILENT
 #define PAM_DATA_SILENT 0
 #endif
--- a/lib/port.c
+++ b/lib/port.c
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
+ * Copyright (c) 1989 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1997, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -34,19 +57,15 @@ static int portcmp (const char *pattern, const char *port)
 {
 	const char *orig = port;

-	while (('\0' != *pattern) && (*pattern == *port)) {
-		pattern++;
-		port++;
-	}
+	while (*pattern && *pattern == *port)
+		pattern++, port++;

-	if (('\0' == *pattern) && ('\0' == *port)) {
+	if (*pattern == 0 && *port == 0)
 		return 0;
-	}
-	if (('S' == orig[0]) && ('U' == orig[1]) && ('\0' == orig[2])) {
+	if (orig[0] == 'S' && orig[1] == 'U' && orig[2] == '\0')
 		return 1;
-	}

-	return (*pattern == '*') ? 0 : 1;
+	return *pattern == '*' ? 0 : 1;
 }

 /*
@@ -58,11 +77,10 @@ static int portcmp (const char *pattern, const char *port)

 static void setportent (void)
 {
-	if (NULL != ports) {
+	if (ports)
 		rewind (ports);
-	} else {
+	else
 		ports = fopen (PORTS, "r");
-	}
 }

 /*
@@ -75,11 +93,10 @@ static void setportent (void)

 static void endportent (void)
 {
-	if (NULL != ports) {
-		(void) fclose (ports);
-	}
+	if (ports)
+		fclose (ports);

-	ports = NULL;
+	ports = (FILE *) 0;
 }

 /*
@@ -108,11 +125,10 @@ static struct port *getportent (void)
 	 * since we want to search from the beginning each time.
 	 */

-	if (NULL == ports) {
+	if (!ports)
 		setportent ();
-	}

-	if (NULL == ports) {
+	if (!ports) {
 		errno = saveerr;
 		return 0;
 	}
@@ -130,17 +146,16 @@ static struct port *getportent (void)
      again:

 	/*
-	 * Get the next line and remove optional trailing '\n'.
-	 * Lines which begin with '#' are all ignored.
+	 * Get the next line and remove the last character, which
+	 * is a '\n'.  Lines which begin with '#' are all ignored.
 	 */

 	if (fgets (buf, sizeof buf, ports) == 0) {
 		errno = saveerr;
 		return 0;
 	}
-	if ('#' == buf[0]) {
+	if (buf[0] == '#')
 		goto again;
-	}

 	/*
 	 * Get the name of the TTY device.  It is the first colon
@@ -149,61 +164,51 @@ static struct port *getportent (void)
 	 * TTY devices.
 	 */

-	buf[strcspn (buf, "\n")] = 0;
+	buf[strlen (buf) - 1] = 0;

 	port.pt_names = ttys;
 	for (cp = buf, j = 0; j < PORT_TTY; j++) {
 		port.pt_names[j] = cp;
-		while (('\0' != *cp) && (':' != *cp) && (',' != *cp)) {
+		while (*cp && *cp != ':' && *cp != ',')
 			cp++;
-		}

-		if ('\0' == *cp) {
+		if (!*cp)
 			goto again;	/* line format error */
-		}

-		if (':' == *cp) {	/* end of tty name list */
+		if (*cp == ':')	/* end of tty name list */
 			break;
-		}

-		if (',' == *cp) {	/* end of current tty name */
+		if (*cp == ',')	/* end of current tty name */
 			*cp++ = '\0';
-		}
 	}
-	*cp = '\0';
-	cp++;
-	port.pt_names[j + 1] = NULL;
+	*cp++ = 0;
+	port.pt_names[j + 1] = (char *) 0;

 	/*
 	 * Get the list of user names.  It is the second colon
 	 * separated field, and is a comma separated list of user
 	 * names.  The entry '*' is used to specify all usernames.
-	 * The last entry in the list is a NULL pointer.
+	 * The last entry in the list is a (char *) 0 pointer.
 	 */

-	if (':' != *cp) {
+	if (*cp != ':') {
 		port.pt_users = users;
 		port.pt_users[0] = cp;

-		for (j = 1; ':' != *cp; cp++) {
-			if ((',' == *cp) && (j < PORT_IDS)) {
-				*cp = '\0';
-				cp++;
-				port.pt_users[j] = cp;
-				j++;
+		for (j = 1; *cp != ':'; cp++) {
+			if (*cp == ',' && j < PORT_IDS) {
+				*cp++ = 0;
+				port.pt_users[j++] = cp;
 			}
 		}
 		port.pt_users[j] = 0;
-	} else {
+	} else
 		port.pt_users = 0;
-	}

-	if (':' != *cp) {
+	if (*cp != ':')
 		goto again;
-	}

-	*cp = '\0';
-	cp++;
+	*cp++ = 0;

 	/*
 	 * Get the list of valid times.  The times field is the third
@@ -218,7 +223,7 @@ static struct port *getportent (void)
 	 * the starting time.  Days are presumed to wrap at 0000.
 	 */

-	if ('\0' == *cp) {
+	if (*cp == '\0') {
 		port.pt_times = 0;
 		return &port;
 	}
@@ -229,7 +234,7 @@ static struct port *getportent (void)
 	 * Get the next comma separated entry
 	 */

-	for (j = 0; ('\0' != *cp) && (j < PORT_TIMES); j++) {
+	for (j = 0; *cp && j < PORT_TIMES; j++) {

 		/*
 		 * Start off with no days of the week
@@ -243,7 +248,7 @@ static struct port *getportent (void)
 		 * week or the other two values.
 		 */

-		for (i = 0; isalpha(cp[i]) && ('\0' != cp[i + 1]); i += 2) {
+		for (i = 0; cp[i] && cp[i + 1] && isalpha (cp[i]); i += 2) {
 			switch ((cp[i] << 8) | (cp[i + 1])) {
 			case ('S' << 8) | 'u':
 				port.pt_times[j].t_days |= 01;
@@ -282,9 +287,8 @@ static struct port *getportent (void)
 		 * The default is 'Al' if no days were seen.
 		 */

-		if (0 == i) {
+		if (i == 0)
 			port.pt_times[j].t_days = 0177;
-		}

 		/*
 		 * The start and end times are separated from each
@@ -292,25 +296,19 @@ static struct port *getportent (void)
 		 * representing the times of day.
 		 */

-		for (dtime = 0; isdigit (cp[i]); i++) {
+		for (dtime = 0; cp[i] && isdigit (cp[i]); i++)
 			dtime = dtime * 10 + cp[i] - '0';
-		}

-		if (('-' != cp[i]) || (dtime > 2400) || ((dtime % 100) > 59)) {
+		if (cp[i] != '-' || dtime > 2400 || dtime % 100 > 59)
 			goto again;
-		}
 		port.pt_times[j].t_start = dtime;
 		cp = cp + i + 1;

-		for (dtime = 0, i = 0; isdigit (cp[i]); i++) {
+		for (dtime = i = 0; cp[i] && isdigit (cp[i]); i++)
 			dtime = dtime * 10 + cp[i] - '0';
-		}

-		if (   ((',' != cp[i]) && ('\0' != cp[i]))
-		    || (dtime > 2400)
-		    || ((dtime % 100) > 59)) {
+		if ((cp[i] != ',' && cp[i]) || dtime > 2400 || dtime % 100 > 59)
 			goto again;
-		}

 		port.pt_times[j].t_end = dtime;
 		cp = cp + i + 1;
@@ -342,32 +340,24 @@ static struct port *getttyuser (const char *tty, const char *user)

 	setportent ();

-	while ((port = getportent ()) != NULL) {
-		if (   (0 == port->pt_names)
-		    || (0 == port->pt_users)) {
+	while ((port = getportent ())) {
+		if (port->pt_names == 0 || port->pt_users == 0)
 			continue;
-		}

-		for (i = 0; NULL != port->pt_names[i]; i++) {
-			if (portcmp (port->pt_names[i], tty) == 0) {
+		for (i = 0; port->pt_names[i]; i++)
+			if (portcmp (port->pt_names[i], tty) == 0)
 				break;
-			}
-		}

-		if (port->pt_names[i] == 0) {
+		if (port->pt_names[i] == 0)
 			continue;
-		}

-		for (j = 0; NULL != port->pt_users[j]; j++) {
-			if (   (strcmp (user, port->pt_users[j]) == 0)
-			    || (strcmp (port->pt_users[j], "*") == 0)) {
+		for (j = 0; port->pt_users[j]; j++)
+			if (strcmp (user, port->pt_users[j]) == 0 ||
+			    strcmp (port->pt_users[j], "*") == 0)
 				break;
-			}
-		}

-		if (port->pt_users[j] != 0) {
+		if (port->pt_users[j] != 0)
 			break;
-		}
 	}
 	endportent ();
 	return port;
@@ -380,7 +370,7 @@ static struct port *getttyuser (const char *tty, const char *user)
 *	the user name and TTY given.
 */

-bool isttytime (const char *id, const char *port, time_t when)
+int isttytime (const char *id, const char *port, time_t when)
 {
 	int i;
 	int dtime;
@@ -389,27 +379,24 @@ bool isttytime (const char *id, const char *port, time_t when)

 	/*
 	 * Try to find a matching entry for this user.  Default to
-	 * letting the user in - there are plenty of ways to have an
+	 * letting the user in - there are pleny of ways to have an
 	 * entry to match all users.
 	 */

-	pp = getttyuser (port, id);
-	if (NULL == pp) {
-		return true;
-	}
+	if (!(pp = getttyuser (port, id)))
+		return 1;

 	/*
 	 * The entry is there, but has no time entries - don't
 	 * ever let them login.
 	 */

-	if (0 == pp->pt_times) {
-		return false;
-	}
+	if (pp->pt_times == 0)
+		return 0;

 	/*
 	 * The current time is converted to HHMM format for
-	 * comparison against the time values in the TTY entry.
+	 * comparision against the time values in the TTY entry.
 	 */

 	tm = localtime (&when);
@@ -418,25 +405,22 @@ bool isttytime (const char *id, const char *port, time_t when)
 	/*
 	 * Each time entry is compared against the current
 	 * time.  For entries with the start after the end time,
-	 * the comparison is made so that the time is between
+	 * the comparision is made so that the time is between
 	 * midnight and either the start or end time.
 	 */

 	for (i = 0; pp->pt_times[i].t_start != -1; i++) {
-		if (!(pp->pt_times[i].t_days & PORT_DAY (tm->tm_wday))) {
+		if (!(pp->pt_times[i].t_days & PORT_DAY (tm->tm_wday)))
 			continue;
-		}

 		if (pp->pt_times[i].t_start <= pp->pt_times[i].t_end) {
-			if (   (dtime >= pp->pt_times[i].t_start)
-			    && (dtime <= pp->pt_times[i].t_end)) {
-				return true;
-			}
+			if (dtime >= pp->pt_times[i].t_start &&
+			    dtime <= pp->pt_times[i].t_end)
+				return 1;
 		} else {
-			if (   (dtime >= pp->pt_times[i].t_start)
-			    || (dtime <= pp->pt_times[i].t_end)) {
-				return true;
-			}
+			if (dtime >= pp->pt_times[i].t_start ||
+			    dtime <= pp->pt_times[i].t_end)
+				return 1;
 		}
 	}

@@ -445,6 +429,5 @@ bool isttytime (const char *id, const char *port, time_t when)
 	 * be let in right now.
 	 */

-	return false;
+	return 0;
 }
-
--- a/lib/port.h
+++ b/lib/port.h
@@ -1,9 +1,32 @@
 /*
- * SPDX-FileCopyrightText: 1989 - 1991, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
+ * Copyright (c) 1989 - 1991, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1997, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 /*
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2010, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2003 - 2006, Tomasz Kłoczko
+ * Copyright (c) 2007 - 2008, Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 /*
@@ -19,110 +42,55 @@
 #ifndef _PROTOTYPES_H
 #define _PROTOTYPES_H

-#include <config.h>
-
-#include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#if HAVE_UTMPX_H
+#include <utmpx.h>
+#else
+#include <utmp.h>
+#endif
 #include <pwd.h>
 #include <grp.h>
 #include <shadow.h>
-#ifdef ENABLE_LASTLOG
 #include <lastlog.h>
-#endif /* ENABLE_LASTLOG */

 #include "defines.h"
 #include "commonio.h"

 /* addgrps.c */
-#if defined (HAVE_SETGROUPS) && ! defined (USE_PAM)
 extern int add_groups (const char *);
-#endif
+extern void add_cons_grps (void);

 /* age.c */
-extern void agecheck (/*@null@*/const struct spwd *);
-extern int expire (const struct passwd *, /*@null@*/const struct spwd *);
-
-/* agetpass.c */
-extern void erase_pass(char *pass);
-ATTR_MALLOC(erase_pass)
-extern char *agetpass(const char *prompt);
-
-/* isexpired.c */
-extern int isexpired (const struct passwd *, /*@null@*/const struct spwd *);
-
-/* btrfs.c */
-#ifdef WITH_BTRFS
-extern int btrfs_create_subvolume(const char *path);
-extern int btrfs_remove_subvolume(const char *path);
-extern int btrfs_is_subvolume(const char *path);
-extern int is_btrfs(const char *path);
-#endif
+extern void agecheck (const struct passwd *, const struct spwd *);
+extern int expire (const struct passwd *, const struct spwd *);
+extern int isexpired (const struct passwd *, const struct spwd *);

 /* basename() renamed to Basename() to avoid libc name space confusion */
 /* basename.c */
-extern /*@observer@*/const char *Basename (const char *str);
+extern char *Basename (char *str);

 /* chowndir.c */
-extern int chown_tree (const char *root,
-                       uid_t old_uid, uid_t new_uid,
-                       gid_t old_gid, gid_t new_gid);
+extern int chown_tree (const char *, uid_t, uid_t, gid_t, gid_t);

 /* chowntty.c */
-extern void chown_tty (const struct passwd *);
-
-/* cleanup.c */
-typedef /*@null@*/void (*cleanup_function) (/*@null@*/void *arg);
-void add_cleanup (/*@notnull@*/cleanup_function pcf, /*@null@*/void *arg);
-void del_cleanup (/*@notnull@*/cleanup_function pcf);
-void do_cleanups (void);
-
-/* cleanup_group.c */
-struct cleanup_info_mod {
-	char *audit_msg;
-	char *action;
-	/*@observer@*/const char *name;
-};
-void cleanup_report_add_group (void *group_name);
-void cleanup_report_add_group_group (void *group_name);
-#ifdef SHADOWGRP
-void cleanup_report_add_group_gshadow (void *group_name);
-#endif
-void cleanup_report_del_group (void *group_name);
-void cleanup_report_del_group_group (void *group_name);
-#ifdef SHADOWGRP
-void cleanup_report_del_group_gshadow (void *group_name);
-#endif
-void cleanup_report_mod_passwd (void *cleanup_info);
-void cleanup_report_mod_group (void *cleanup_info);
-void cleanup_report_mod_gshadow (void *cleanup_info);
-void cleanup_unlock_group (/*@null@*/void *unused);
-#ifdef SHADOWGRP
-void cleanup_unlock_gshadow (/*@null@*/void *unused);
-#endif
-void cleanup_unlock_passwd (/*@null@*/void *unused);
+extern void chown_tty (const char *, const struct passwd *);

 /* console.c */
-extern bool console (const char *);
+extern int console (const char *);

 /* copydir.c */
 extern int copy_tree (const char *src_root, const char *dst_root,
-                      bool copy_root,
-                      bool reset_selinux,
-                      uid_t old_uid, uid_t new_uid,
-                      gid_t old_gid, gid_t new_gid);
-
-/* date_to_str.c */
-extern void date_to_str (size_t size, char buf[size], long date);
+                      long int uid, long int gid);
+extern int remove_tree (const char *root);

 /* encrypt.c */
-extern /*@exposed@*//*@null@*/char *pw_encrypt (const char *, const char *);
+extern char *pw_encrypt (const char *, const char *);

 /* entry.c */
 extern void pw_entry (const char *, struct passwd *);

 /* env.c */
-extern void addenv (const char *, /*@null@*/const char *);
+extern void addenv (const char *, const char *);
 extern void initenv (void);
 extern void set_env (int, char *const *);
 extern void sanitize_env (void);
@@ -131,112 +99,58 @@ extern void sanitize_env (void);
 extern void change_field (char *, size_t, const char *);
 extern int valid_field (const char *, const char *);

-/* find_new_gid.c */
-extern int find_new_gid (bool sys_group,
-                         gid_t *gid,
-                         /*@null@*/gid_t const *preferred_gid);
-
-/* find_new_uid.c */
-extern int find_new_uid (bool sys_user,
-                         uid_t *uid,
-                         /*@null@*/uid_t const *preferred_uid);
-
-#ifdef ENABLE_SUBIDS
-/* find_new_sub_gids.c */
-extern int find_new_sub_gids (gid_t *range_start, unsigned long *range_count);
-
-/* find_new_sub_uids.c */
-extern int find_new_sub_uids (uid_t *range_start, unsigned long *range_count);
-#endif				/* ENABLE_SUBIDS */
-
-
-/* get_gid.c */
-extern int get_gid (const char *gidstr, gid_t *gid);
-
-/* getgr_nam_gid.c */
-extern /*@only@*//*@null@*/struct group *getgr_nam_gid (/*@null@*/const char *grname);
+/* find_new_ids.c */
+extern int find_new_uid (int sys_user, uid_t *uid, uid_t const *preferred_uid);
+extern int find_new_gid (int sys_group, gid_t *gid, gid_t const *preferred_gid);

 /* getlong.c */
-extern int getlong (const char *numstr, /*@out@*/long int *result);
-
-/* get_pid.c */
-extern int get_pid (const char *pidstr, pid_t *pid);
-extern int get_pidfd_from_fd(const char *pidfdstr);
-extern int open_pidfd(const char *pidstr);
-
-/* getrange */
-extern int getrange (const char *range,
-                     unsigned long *min, bool *has_min,
-                     unsigned long *max, bool *has_max);
-
-/* gettime.c */
-extern time_t gettime (void);
-
-/* get_uid.c */
-extern int get_uid (const char *uidstr, uid_t *uid);
-
-/* getulong.c */
-extern int getulong (const char *numstr, /*@out@*/unsigned long int *result);
+extern int getlong(const char *numstr, long int *result);

 /* fputsx.c */
-extern /*@null@*/char *fgetsx (/*@returned@*/ /*@out@*/char *, int, FILE *);
+extern char *fgetsx (char *, int, FILE *);
 extern int fputsx (const char *, FILE *);

 /* groupio.c */
 extern void __gr_del_entry (const struct commonio_entry *ent);
-extern /*@observer@*/const struct commonio_db *__gr_get_db (void);
-extern /*@dependent@*/ /*@null@*/struct commonio_entry *__gr_get_head (void);
+extern struct commonio_db *__gr_get_db (void);
+extern struct commonio_entry *__gr_get_head (void);
 extern void __gr_set_changed (void);

 /* groupmem.c */
-extern /*@null@*/ /*@only@*/struct group *__gr_dup (const struct group *grent);
-extern void gr_free_members (struct group *grent);
-extern void gr_free (/*@out@*/ /*@only@*/struct group *grent);
+extern struct group *__gr_dup (const struct group *grent);

 /* hushed.c */
-extern bool hushed (const char *username);
+extern int hushed (const struct passwd *);

 /* audit_help.c */
 #ifdef WITH_AUDIT
 extern int audit_fd;
 extern void audit_help_open (void);
-/* Use AUDIT_NO_ID when a name is provided to audit_logger instead of an ID */
-#define AUDIT_NO_ID	((unsigned int) -1)
-typedef enum {
-	SHADOW_AUDIT_FAILURE = 0,
-	SHADOW_AUDIT_SUCCESS = 1} shadow_audit_result;
 extern void audit_logger (int type, const char *pgname, const char *op,
-                          const char *name, unsigned int id,
-                          shadow_audit_result result);
-void audit_logger_message (const char *message, shadow_audit_result result);
+			  const char *name, unsigned int id, int result);
 #endif

 /* limits.c */
-#ifndef USE_PAM
 extern void setup_limits (const struct passwd *);
-#endif

 /* list.c */
-extern /*@only@*/ /*@out@*/char **add_list (/*@returned@*/ /*@only@*/char **, const char *);
-extern /*@only@*/ /*@out@*/char **del_list (/*@returned@*/ /*@only@*/char **, const char *);
-extern /*@only@*/ /*@out@*/char **dup_list (char *const *);
-extern bool is_on_list (char *const *list, const char *member);
-extern /*@only@*/char **comma_to_list (const char *);
+extern char **add_list (char **, const char *);
+extern char **del_list (char **, const char *);
+extern char **dup_list (char *const *);
+extern int is_on_list (char *const *, const char *);
+extern char **comma_to_list (const char *);

-#ifdef ENABLE_LASTLOG
 /* log.c */
-extern void dolastlog (
-	struct lastlog *ll,
-	const struct passwd *pw,
-	/*@unique@*/const char *line,
-	/*@unique@*/const char *host);
-#endif /* ENABLE_LASTLOG */
+extern void dolastlog (struct lastlog *ll,
+                       const struct passwd *pw,
+                       const char *line,
+                       const char *host);

 /* login_nopam.c */
 extern int login_access (const char *user, const char *from);

 /* loginprompt.c */
-extern void login_prompt (char *, int);
+extern void login_prompt (const char *, char *, int);

 /* mail.c */
 extern void mailcheck (void);
@@ -245,108 +159,22 @@ extern void mailcheck (void);
 extern void motd (void);

 /* myname.c */
-extern /*@null@*//*@only@*/struct passwd *get_my_pwent (void);
-
-/* nss.c */
-#include <libsubid/subid.h>
-extern void nss_init(const char *nsswitch_path);
-extern bool nss_is_initialized(void);
-
-struct subid_nss_ops {
-	/*
-	 * nss_has_range: does a user own a given subid range
-	 *
-	 * @owner: username
-	 * @start: first subid in queried range
-	 * @count: number of subids in queried range
-	 * @idtype: subuid or subgid
-	 * @result: true if @owner has been allocated the subid range.
-	 *
-	 * returns success if the module was able to determine an answer (true or false),
-	 * else an error status.
-	 */
-	enum subid_status (*has_range)(const char *owner, unsigned long start, unsigned long count, enum subid_type idtype, bool *result);
-
-	/*
-	 * nss_list_owner_ranges: list the subid ranges delegated to a user.
-	 *
-	 * @owner - string representing username being queried
-	 * @id_type - subuid or subgid
-	 * @ranges - pointer to an array of struct subid_range, or NULL.  The
-	 *           returned array must be freed by the caller.
-	 * @count - pointer to an integer into which the number of returned ranges
-	 *          is written.
-
-	 * returns success if the module was able to determine an answer,
-	 * else an error status.
-	 */
-	enum subid_status (*list_owner_ranges)(const char *owner, enum subid_type id_type, struct subid_range **ranges, int *count);
-
-	/*
-	 * nss_find_subid_owners: find uids who own a given subuid or subgid.
-	 *
-	 * @id - the delegated id (subuid or subgid) being queried
-	 * @id_type - subuid or subgid
-	 * @uids - pointer to an array of uids which will be allocated by
-	 *         nss_find_subid_owners()
-	 * @count - number of uids found
-	 *
-	 * returns success if the module was able to determine an answer,
-	 * else an error status.
-	 */
-	enum subid_status (*find_subid_owners)(unsigned long id, enum subid_type id_type, uid_t **uids, int *count);
-
-	/* The dlsym handle to close */
-	void *handle;
-};
-
-extern struct subid_nss_ops *get_subid_nss_handle(void);
-
-
-/* pam_pass_non_interactive.c */
-#ifdef USE_PAM
-extern int do_pam_passwd_non_interactive (const char *pam_service,
-                                           const char *username,
-                                           const char* password);
-#endif				/* USE_PAM */
+extern struct passwd *get_my_pwent (void);

 /* obscure.c */
-extern bool obscure (const char *, const char *, const struct passwd *);
+extern int obscure (const char *, const char *, const struct passwd *);

 /* pam_pass.c */
-#ifdef USE_PAM
-extern void do_pam_passwd (const char *user, bool silent, bool change_expired);
-#endif
+extern void do_pam_passwd (const char *, int, int);

 /* port.c */
-extern bool isttytime (const char *, const char *, time_t);
-
-/* prefix_flag.c */
-extern const char* process_prefix_flag (const char* short_opt, int argc, char **argv);
-extern struct group *prefix_getgrnam(const char *name);
-extern struct group *prefix_getgrgid(gid_t gid);
-extern struct passwd *prefix_getpwuid(uid_t uid);
-extern struct passwd *prefix_getpwnam(const char* name);
-#if HAVE_FGETPWENT_R
-extern int prefix_getpwnam_r(const char* name, struct passwd* pwd,
-                             char* buf, size_t buflen, struct passwd** result);
-#endif
-extern struct spwd *prefix_getspnam(const char* name);
-extern struct group *prefix_getgr_nam_gid(const char *grname);
-extern void prefix_setpwent(void);
-extern struct passwd* prefix_getpwent(void);
-extern void prefix_endpwent(void);
-extern void prefix_setgrent(void);
-extern struct group* prefix_getgrent(void);
-extern void prefix_endgrent(void);
+extern int isttytime (const char *, const char *, time_t);

 /* pwd2spwd.c */
 extern struct spwd *pwd_to_spwd (const struct passwd *);

 /* pwdcheck.c */
-#ifndef USE_PAM
 extern void passwd_check (const char *, const char *, const char *);
-#endif

 /* pwd_init.c */
 extern void pwd_init (void);
@@ -354,52 +182,21 @@ extern void pwd_init (void);
 /* pwio.c */
 extern void __pw_del_entry (const struct commonio_entry *ent);
 extern struct commonio_db *__pw_get_db (void);
-extern /*@dependent@*/ /*@null@*/struct commonio_entry *__pw_get_head (void);
+extern struct commonio_entry *__pw_get_head (void);

 /* pwmem.c */
-extern /*@null@*/ /*@only@*/struct passwd *__pw_dup (const struct passwd *pwent);
-extern void pw_free (/*@out@*/ /*@only@*/struct passwd *pwent);
-
-/* csrand.c */
-unsigned long csrand (void);
-unsigned long csrand_uniform (unsigned long n);
-unsigned long csrand_interval (unsigned long min, unsigned long max);
-
-/* remove_tree.c */
-extern int remove_tree (const char *root, bool remove_root);
+extern struct passwd *__pw_dup (const struct passwd *pwent);

 /* rlogin.c */
-extern int do_rlogin (const char *remote_host, char *name, size_t namelen,
-                      char *term, size_t termlen);
-
-/* root_flag.c */
-extern void process_root_flag (const char* short_opt, int argc, char **argv);
+extern int do_rlogin (const char *, char *, int, char *, int);

 /* salt.c */
-extern /*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const char *meth, /*@null@*/void *arg);
-
-/* selinux.c */
-#ifdef WITH_SELINUX
-extern int set_selinux_file_context (const char *dst_name, mode_t mode);
-extern void reset_selinux_handle (void);
-extern int reset_selinux_file_context (void);
-extern int check_selinux_permit (const char *perm_name);
-#endif
-
-/* semanage.c */
-#ifdef WITH_SELINUX
-extern int set_seuser(const char *login_name, const char *seuser_name, const char *serange);
-extern int del_seuser(const char *login_name);
-#endif
+extern char *crypt_make_salt (const char *meth, void *arg);

 /* setugid.c */
-extern int setup_groups (const struct passwd *info);
-extern int change_uid (const struct passwd *info);
-#if (defined HAVE_INITGROUPS) && (! defined USE_PAM)
-extern int setup_uid_gid (const struct passwd *info, bool is_console);
-#else
-extern int setup_uid_gid (const struct passwd *info);
-#endif
+extern int setup_groups (const struct passwd *);
+extern int change_uid (const struct passwd *);
+extern int setup_uid_gid (const struct passwd *, int);

 /* setup.c */
 extern void setup (struct passwd *);
@@ -413,46 +210,30 @@ extern struct group *sgetgrent (const char *buf);
 /* sgetpwent.c */
 extern struct passwd *sgetpwent (const char *buf);

-/* sgetspent.c */
-#ifndef HAVE_SGETSPENT
-extern struct spwd *sgetspent (const char *string);
-#endif
-
 /* sgroupio.c */
 extern void __sgr_del_entry (const struct commonio_entry *ent);
-extern /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent);
-extern void sgr_free (/*@out@*/ /*@only@*/struct sgrp *sgent);
-extern /*@dependent@*/ /*@null@*/struct commonio_entry *__sgr_get_head (void);
+extern struct sgrp *__sgr_dup (const struct sgrp *sgent);
+extern struct commonio_entry *__sgr_get_head (void);
 extern void __sgr_set_changed (void);

 /* shadowio.c */
-extern /*@dependent@*/ /*@null@*/struct commonio_entry *__spw_get_head (void);
+extern struct commonio_entry *__spw_get_head (void);
 extern void __spw_del_entry (const struct commonio_entry *ent);

 /* shadowmem.c */
-extern /*@null@*/ /*@only@*/struct spwd *__spw_dup (const struct spwd *spent);
-extern void spw_free (/*@out@*/ /*@only@*/struct spwd *spent);
+extern struct spwd *__spw_dup (const struct spwd *spent);

 /* shell.c */
-extern int shell (const char *file, /*@null@*/const char *arg, char *const envp[]);
-
-/* spawn.c */
-extern int run_command (const char *cmd, const char *argv[],
-                        /*@null@*/const char *envp[], /*@out@*/int *status);
+extern int shell (const char *, const char *, char *const *);

 /* strtoday.c */
 extern long strtoday (const char *);

 /* suauth.c */
-extern int check_su_auth (const char *actual_id,
-                          const char *wanted_id,
-                          bool su_to_root);
+extern int check_su_auth (const char *actual_id, const char *wanted_id);

 /* sulog.c */
-extern void sulog (const char *tty,
-                   bool success,
-                   const char *oldname,
-                   const char *name);
+extern void sulog (const char *, int, const char *, const char *);

 /* sub.c */
 extern void subsystem (const struct passwd *);
@@ -461,88 +242,34 @@ extern void subsystem (const struct passwd *);
 extern void ttytype (const char *);

 /* tz.c */
-#ifndef USE_PAM
-extern /*@observer@*/const char *tz (const char *);
-#endif
+extern char *tz (const char *);

 /* ulimit.c */
-extern int set_filesize_limit (int blocks);
+extern void set_filesize_limit (int);

-/* user_busy.c */
-extern int user_busy (const char *name, uid_t uid);
-
-/*
- * Session management: utmp.c or logind.c
- */
-
-/**
- * @brief Get host for the current session
- *
- * @param[out] out Host name
- *
- * @return 0 or a positive integer if the host was obtained properly,
- *         another value on error.
- */
-extern int get_session_host (char **out);
-#ifndef ENABLE_LOGIND
-/**
- * @brief Update or create an utmp entry in utmp, wtmp, utmpw, or wtmpx
- *
- * @param[in] user username
- * @param[in] tty tty
- * @param[in] host hostname
- *
- * @return 0 if utmp was updated properly,
- *         1 on error.
- */
-extern int update_utmp (const char *user,
-                        const char *tty,
-                        const char *host);
-/**
- * @brief Update the cumulative failure log
- *
- * @param[in] failent_user username
- * @param[in] tty tty
- * @param[in] host hostname
- *
- */
-extern void record_failure(const char *failent_user,
-                           const char *tty,
-                           const char *hostname);
-#endif /* ENABLE_LOGIND */
-
-/**
- * @brief Number of active user sessions
- *
- * @param[in] name username
- * @param[in] limit maximum number of active sessions
- *
- * @return number of active sessions.
- *
- */
-extern unsigned long active_sessions_count(const char *name,
-                                           unsigned long limit);
+/* utmp.c */
+extern void checkutmp (int);
+extern void setutmp (const char *, const char *, const char *);

 /* valid.c */
-extern bool valid (const char *, const struct passwd *);
+extern int valid (const char *, const struct passwd *);

-/* write_full.c */
-extern ssize_t write_full(int fd, const void *buf, size_t count);
+/* xmalloc.c */
+extern char *xmalloc (size_t);
+extern char *xstrdup (const char *);

 /* xgetpwnam.c */
-extern /*@null@*/ /*@only@*/struct passwd *xgetpwnam (const char *);
-/* xprefix_getpwnam.c */
-extern /*@null@*/ /*@only@*/struct passwd *xprefix_getpwnam (const char *);
+extern struct passwd *xgetpwnam (const char *);
 /* xgetpwuid.c */
-extern /*@null@*/ /*@only@*/struct passwd *xgetpwuid (uid_t);
+extern struct passwd *xgetpwuid (uid_t);
 /* xgetgrnam.c */
-extern /*@null@*/ /*@only@*/struct group *xgetgrnam (const char *);
+extern struct group *xgetgrnam (const char *);
 /* xgetgrgid.c */
-extern /*@null@*/ /*@only@*/struct group *xgetgrgid (gid_t);
+extern struct group *xgetgrgid (gid_t);
 /* xgetspnam.c */
-extern /*@null@*/ /*@only@*/struct spwd *xgetspnam(const char *);
+extern struct spwd *xgetspnam(const char *);

 /* yesno.c */
-extern bool yes_or_no (bool read_only);
+extern int yes_or_no (int read_only);

 #endif				/* _PROTOTYPES_H */
--- a/lib/pwauth.c
+++ b/lib/pwauth.c
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1992 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008 - 2009, Nicolas François
+ * Copyright (c) 1992 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2003 - 2006, Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -31,8 +54,8 @@ static const char *PROMPT = gettext_noop ("Password: ");
 static const char *PROMPT = gettext_noop ("%s's Password: ");
 #endif

-bool wipe_clear_pass = true;
-/*@null@*/char *clear_pass = NULL;
+int wipe_clear_pass = 1;
+char *clear_pass = NULL;

 /*
 * pw_auth - perform getpass/crypt authentication
@@ -42,19 +65,16 @@ bool wipe_clear_pass = true;
 *	compared.
 */

-int pw_auth (const char *cipher,
-             const char *user,
-             int reason,
-             /*@null@*/const char *input)
+int
+pw_auth (const char *cipher, const char *user, int reason, const char *input)
 {
 	char prompt[1024];
 	char *clear = NULL;
 	const char *cp;
-	const char *encrypted;
 	int retval;

 #ifdef	SKEY
-	bool use_skey = false;
+	int use_skey = 0;
 	char challenge_info[40];
 	struct skey skey;
 #endif
@@ -63,17 +83,15 @@ int pw_auth (const char *cipher,
 	 * There are programs for adding and deleting authentication data.
 	 */

-	if ((PW_ADD == reason) || (PW_DELETE == reason)) {
+	if (reason == PW_ADD || reason == PW_DELETE)
 		return 0;
-	}

 	/*
 	 * There are even programs for changing the user name ...
 	 */

-	if ((PW_CHANGE == reason) && (NULL != input)) {
+	if (reason == PW_CHANGE && input != (char *) 0)
 		return 0;
-	}

 	/*
 	 * WARNING:
@@ -84,9 +102,8 @@ int pw_auth (const char *cipher,
 	 * revisited.
 	 */

-	if ((PW_CHANGE == reason) && (getuid () == 0)) {
+	if (reason == PW_CHANGE && getuid () == 0)
 		return 0;
-	}

 	/*
 	 * WARNING:
@@ -97,14 +114,13 @@ int pw_auth (const char *cipher,
 	 * matter.
 	 */

-	if ((NULL == cipher) || ('\0' == *cipher)) {
+	if (cipher == (char *) 0 || *cipher == '\0')
 		return 0;
-	}

 #ifdef	SKEY
 	/*
 	 * If the user has an S/KEY entry show them the pertinent info
-	 * and then we can try validating the created ciphertext and the SKEY.
+	 * and then we can try validating the created cyphertext and the SKEY.
 	 * If there is no SKEY information we default to not using SKEY.
 	 */

@@ -116,9 +132,8 @@ int pw_auth (const char *cipher,
 #  define skeychallenge(s,u,c) skeychallenge(s,u,c,sizeof(c))
 # endif

-	if (skeychallenge (&skey, user, challenge_info) == 0) {
-		use_skey = true;
-	}
+	if (skeychallenge (&skey, user, challenge_info) == 0)
+		use_skey = 1;
 #endif

 	/*
@@ -126,20 +141,17 @@ int pw_auth (const char *cipher,
 	 * get the cleartext password for us.
 	 */

-	if ((PW_FTP != reason) && (PW_REXEC != reason) && (NULL == input)) {
-		cp = getdef_str ("LOGIN_STRING");
-		if (NULL == cp) {
+	if (reason != PW_FTP && reason != PW_REXEC && !input) {
+		if (!(cp = getdef_str ("LOGIN_STRING")))
 			cp = _(PROMPT);
-		}
 #ifdef	SKEY
-		if (use_skey) {
+		if (use_skey)
 			printf ("[%s]\n", challenge_info);
-		}
 #endif

 		snprintf (prompt, sizeof prompt, cp, user);
 		clear = getpass (prompt);
-		if (NULL == clear) {
+		if (!clear) {
 			static char c[1];

 			c[0] = '\0';
@@ -155,12 +167,7 @@ int pw_auth (const char *cipher,
 	 * the results there as well.
 	 */

-	encrypted = pw_encrypt (input, cipher);
-	if (NULL != encrypted) {
-		retval = strcmp (encrypted, cipher);
-	} else {
-		retval = -1;
-	}
+	retval = strcmp (pw_encrypt (input, cipher), cipher);

 #ifdef  SKEY
 	/*
@@ -170,9 +177,9 @@ int pw_auth (const char *cipher,
 	 * ...Re-prompt, with echo on.
 	 * -- AR 8/22/1999
 	 */
-	if ((0 != retval) && ('\0' == input[0]) && use_skey) {
+	if (retval && !input[0] && (use_skey)) {
 		clear = getpass (prompt);
-		if (NULL == clear) {
+		if (!clear) {
 			static char c[1];

 			c[0] = '\0';
@@ -181,15 +188,13 @@ int pw_auth (const char *cipher,
 		input = clear;
 	}

-	if ((0 != retval) && use_skey) {
+	if (retval && use_skey) {
 		int passcheck = -1;

-		if (skeyverify (&skey, input) == 0) {
+		if (skeyverify (&skey, input) == 0)
 			passcheck = skey.n;
-		}
-		if (passcheck > 0) {
+		if (passcheck > 0)
 			retval = 0;
-		}
 	}
 #endif

@@ -201,11 +206,10 @@ int pw_auth (const char *cipher,
 	 */

 	clear_pass = clear;
-	if (wipe_clear_pass && (NULL != clear) && ('\0' != *clear)) {
+	if (wipe_clear_pass && clear && *clear)
 		strzero (clear);
-	}
 	return retval;
 }
 #else				/* !USE_PAM */
-extern int ISO_C_forbids_an_empty_translation_unit;
+extern int errno;		/* warning: ANSI C forbids an empty source file */
 #endif				/* !USE_PAM */
--- a/lib/pwauth.h
+++ b/lib/pwauth.h
@@ -1,24 +1,40 @@
 /*
- * SPDX-FileCopyrightText: 1992 - 1993, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2009       , Nicolas François
+ * Copyright (c) 1992 - 1993, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1997, Marek Michałkiewicz
+ * Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 /*
 *	$Id$
 */

-#ifndef _PWAUTH_H
-#define _PWAUTH_H
-
 #ifndef USE_PAM
-int pw_auth (const char *cipher,
-             const char *user,
-             int flag,
-             /*@null@*/const char *input);
+int pw_auth (const char *cipher, const char *user, int flag, const char *input);
 #endif				/* !USE_PAM */

 /*
@@ -44,5 +60,3 @@ int pw_auth (const char *cipher,
 #define	PW_RLOGIN	202
 #define	PW_FTP		203
 #define	PW_REXEC	204
-
-#endif /* _PWAUTH_H */
--- a/lib/pwio.c
+++ b/lib/pwio.c
@@ -1,11 +1,34 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001       , Michał Moskal
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2009, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001       , Michał Moskal
+ * Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * Copyright (c) 2007 - 2008, Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -19,18 +42,23 @@
 #include "commonio.h"
 #include "pwio.h"

-static /*@null@*/ /*@only@*/void *passwd_dup (const void *ent)
+static void *passwd_dup (const void *ent)
 {
 	const struct passwd *pw = ent;

 	return __pw_dup (pw);
 }

-static void passwd_free (/*@out@*/ /*@only@*/void *ent)
+static void passwd_free (void *ent)
 {
 	struct passwd *pw = ent;

-	pw_free (pw);
+	free (pw->pw_name);
+	free (pw->pw_passwd);
+	free (pw->pw_gecos);
+	free (pw->pw_dir);
+	free (pw->pw_shell);
+	free (pw);
 }

 static const char *passwd_getname (const void *ent)
@@ -42,27 +70,13 @@ static const char *passwd_getname (const void *ent)

 static void *passwd_parse (const char *line)
 {
-	return sgetpwent (line);
+	return (void *) sgetpwent (line);
 }

 static int passwd_put (const void *ent, FILE * file)
 {
 	const struct passwd *pw = ent;

-	if (   (NULL == pw)
-	    || (valid_field (pw->pw_name, ":\n") == -1)
-	    || (valid_field (pw->pw_passwd, ":\n") == -1)
-	    || (pw->pw_uid == (uid_t)-1)
-	    || (pw->pw_gid == (gid_t)-1)
-	    || (valid_field (pw->pw_gecos, ":\n") == -1)
-	    || (valid_field (pw->pw_dir, ":\n") == -1)
-	    || (valid_field (pw->pw_shell, ":\n") == -1)
-	    || (strlen (pw->pw_name) + strlen (pw->pw_passwd) +
-	        strlen (pw->pw_gecos) + strlen (pw->pw_dir) +
-	        strlen (pw->pw_shell) + 100 > PASSWD_ENTRY_MAX_LENGTH)) {
-		return -1;
-	}
-
 	return (putpwent (pw, file) == -1) ? -1 : 0;
 }

@@ -85,29 +99,20 @@ static struct commonio_db passwd_db = {
 #ifdef WITH_SELINUX
 	NULL,			/* scontext */
 #endif
-	0644,                   /* st_mode */
-	0,                      /* st_uid */
-	0,                      /* st_gid */
 	NULL,			/* head */
 	NULL,			/* tail */
 	NULL,			/* cursor */
-	false,			/* changed */
-	false,			/* isopen */
-	false,			/* locked */
-	false,			/* readonly */
-	false			/* setname */
+	0,			/* changed */
+	0,			/* isopen */
+	0,			/* locked */
+	0			/* readonly */
 };

-int pw_setdbname (const char *filename)
+int pw_name (const char *filename)
 {
 	return commonio_setname (&passwd_db, filename);
 }

-/*@observer@*/const char *pw_dbname (void)
-{
-	return passwd_db.filename;
-}
-
 int pw_lock (void)
 {
 	return commonio_lock (&passwd_db);
@@ -118,12 +123,12 @@ int pw_open (int mode)
 	return commonio_open (&passwd_db, mode);
 }

-/*@observer@*/ /*@null@*/const struct passwd *pw_locate (const char *name)
+const struct passwd *pw_locate (const char *name)
 {
 	return commonio_locate (&passwd_db, name);
 }

-/*@observer@*/ /*@null@*/const struct passwd *pw_locate_uid (uid_t uid)
+const struct passwd *pw_locate_uid (uid_t uid)
 {
 	const struct passwd *pwd;

@@ -137,7 +142,7 @@ int pw_open (int mode)

 int pw_update (const struct passwd *pw)
 {
-	return commonio_update (&passwd_db, pw);
+	return commonio_update (&passwd_db, (const void *) pw);
 }

 int pw_remove (const char *name)
@@ -150,7 +155,7 @@ int pw_rewind (void)
 	return commonio_rewind (&passwd_db);
 }

-/*@observer@*/ /*@null@*/const struct passwd *pw_next (void)
+const struct passwd *pw_next (void)
 {
 	return commonio_next (&passwd_db);
 }
@@ -165,7 +170,7 @@ int pw_unlock (void)
 	return commonio_unlock (&passwd_db);
 }

-/*@null@*/struct commonio_entry *__pw_get_head (void)
+struct commonio_entry *__pw_get_head (void)
 {
 	return passwd_db.head;
 }
--- a/lib/pwio.h
+++ b/lib/pwio.h
@@ -1,32 +1,47 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Michał Moskal
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2005       , Michał Moskal
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-/* $Id$ */
-#ifndef _PWIO_H
-#define _PWIO_H
-
-#include <sys/types.h>
 #include <pwd.h>
-
 extern int pw_close (void);
-extern /*@observer@*/ /*@null@*/const struct passwd *pw_locate (const char *name);
-extern /*@observer@*/ /*@null@*/const struct passwd *pw_locate_uid (uid_t uid);
+extern const struct passwd *pw_locate (const char *);
+extern const struct passwd *pw_locate_uid (uid_t uid);
 extern int pw_lock (void);
-extern int pw_setdbname (const char *filename);
-extern /*@observer@*/const char *pw_dbname (void);
-extern /*@observer@*/ /*@null@*/const struct passwd *pw_next (void);
-extern int pw_open (int mode);
-extern int pw_remove (const char *name);
+extern int pw_name (const char *);
+extern const struct passwd *pw_next (void);
+extern int pw_open (int);
+extern int pw_remove (const char *);
 extern int pw_rewind (void);
 extern int pw_unlock (void);
-extern int pw_update (const struct passwd *pw);
+extern int pw_update (const struct passwd *);
 extern int pw_sort (void);

-#endif
--- a/lib/pwmem.c
+++ b/lib/pwmem.c
@@ -1,86 +1,63 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001       , Michał Moskal
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2013, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001       , Michał Moskal
+ * Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * Copyright (c) 2007       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>

 #ident "$Id$"

-#include <stdio.h>
-
-#include "alloc.h"
-#include "defines.h"
 #include "prototypes.h"
+#include "defines.h"
+#include <pwd.h>
+#include <stdio.h>
 #include "pwio.h"

-/*@null@*/ /*@only@*/struct passwd *__pw_dup (const struct passwd *pwent)
+struct passwd *__pw_dup (const struct passwd *pwent)
 {
 	struct passwd *pw;

-	pw = CALLOC (1, struct passwd);
-	if (NULL == pw) {
+	if (!(pw = (struct passwd *) malloc (sizeof *pw)))
 		return NULL;
-	}
-	/* The libc might define other fields. They won't be copied. */
-	pw->pw_uid = pwent->pw_uid;
-	pw->pw_gid = pwent->pw_gid;
-	/*@-mustfreeonly@*/
-	pw->pw_name = strdup (pwent->pw_name);
-	/*@=mustfreeonly@*/
-	if (NULL == pw->pw_name) {
-		pw_free(pw);
+	*pw = *pwent;
+	if (!(pw->pw_name = strdup (pwent->pw_name)))
 		return NULL;
-	}
-	/*@-mustfreeonly@*/
-	pw->pw_passwd = strdup (pwent->pw_passwd);
-	/*@=mustfreeonly@*/
-	if (NULL == pw->pw_passwd) {
-		pw_free(pw);
+	if (!(pw->pw_passwd = strdup (pwent->pw_passwd)))
 		return NULL;
-	}
-	/*@-mustfreeonly@*/
-	pw->pw_gecos = strdup (pwent->pw_gecos);
-	/*@=mustfreeonly@*/
-	if (NULL == pw->pw_gecos) {
-		pw_free(pw);
+	if (!(pw->pw_gecos = strdup (pwent->pw_gecos)))
 		return NULL;
-	}
-	/*@-mustfreeonly@*/
-	pw->pw_dir = strdup (pwent->pw_dir);
-	/*@=mustfreeonly@*/
-	if (NULL == pw->pw_dir) {
-		pw_free(pw);
+	if (!(pw->pw_dir = strdup (pwent->pw_dir)))
 		return NULL;
-	}
-	/*@-mustfreeonly@*/
-	pw->pw_shell = strdup (pwent->pw_shell);
-	/*@=mustfreeonly@*/
-	if (NULL == pw->pw_shell) {
-		pw_free(pw);
+	if (!(pw->pw_shell = strdup (pwent->pw_shell)))
 		return NULL;
-	}
-
 	return pw;
 }

-void pw_free (/*@out@*/ /*@only@*/struct passwd *pwent)
-{
-	if (pwent != NULL) {
-		free (pwent->pw_name);
-		if (pwent->pw_passwd) {
-			strzero (pwent->pw_passwd);
-			free (pwent->pw_passwd);
-		}
-		free (pwent->pw_gecos);
-		free (pwent->pw_dir);
-		free (pwent->pw_shell);
-		free (pwent);
-	}
-}
-
--- a/lib/run_part.c
+++ b/lib/run_part.c
@@ -1,106 +0,0 @@
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <lib/prototypes.h>
-
-#include "alloc.h"
-#include "run_part.h"
-#include "shadowlog_internal.h"
-
-int run_part (char *script_path, const char *name, const char *action)
-{
-	int pid;
-	int wait_status;
-	int pid_status;
-	char *args[] = { script_path, NULL };
-
-	pid=fork();
-	if (pid==-1) {
-		perror ("Could not fork");
-		return 1;
-	}
-	if (pid==0) {
-		setenv ("ACTION",action,1);
-		setenv ("SUBJECT",name,1);
-		execv (script_path,args);
-		perror ("execv");
-		exit(1);
-	}
-
-	pid_status = wait (&wait_status);
-	if (pid_status == pid) {
-		return (wait_status);
-	}
-
-	perror ("waitpid");
-	return (1);
-}
-
-int run_parts (const char *directory, const char *name, const char *action)
-{
-	struct dirent **namelist;
-	int scanlist;
-	int n;
-	int execute_result = 0;
-
-	scanlist = scandir (directory, &namelist, 0, alphasort);
-	if (scanlist<=0) {
-		return (0);
-	}
-
-	for (n=0; n<scanlist; n++) {
-		int path_length;
-		struct stat sb;
-
-		path_length=strlen(directory) + strlen(namelist[n]->d_name) + 2;
-		char *s = MALLOC(path_length, char);
-		if (!s) {
-			printf ("could not allocate memory\n");
-			for (; n<scanlist; n++) {
-				free (namelist[n]);
-			}
-			free (namelist);
-			return (1);
-		}
-		snprintf (s, path_length, "%s/%s", directory, namelist[n]->d_name);
-
-		execute_result = 0;
-		if (stat (s, &sb) == -1) {
-			perror ("stat");
-			free (s);
-			for (; n<scanlist; n++) {
-				free (namelist[n]);
-			}
-			free (namelist);
-			return (1);
-		}
-
-		if (S_ISREG (sb.st_mode) || S_ISLNK (sb.st_mode)) {
-			execute_result = run_part (s, name, action);
-		}
-
-		free (s);
-
-		if (execute_result!=0) {
-			fprintf (shadow_logfd,
-				"%s: did not exit cleanly.\n",
-			    namelist[n]->d_name);
-			for (; n<scanlist; n++) {
-				free (namelist[n]);
-			}
-			break;
-		}
-
-		free (namelist[n]);
-	}
-	free (namelist);
-
-	return (execute_result);
-}
-
--- a/lib/run_part.h
+++ b/lib/run_part.h
@@ -1,7 +0,0 @@
-#ifndef _RUN_PART_H
-#define _RUN_PART_H
-
-int run_part (char *script_path, const char *name, const char *action);
-int run_parts (const char *directory, const char *name, const char *action);
-
-#endif /* _RUN_PART_H */
--- a/lib/selinux.c
+++ b/lib/selinux.c
@@ -1,210 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2011       , Peter Vrabec <pvrabec@redhat.com>
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ifdef WITH_SELINUX
-
-#include <stdio.h>
-#include "defines.h"
-
-#include <selinux/selinux.h>
-#include <selinux/label.h>
-#include "prototypes.h"
-
-#include "shadowlog_internal.h"
-
-static bool selinux_checked = false;
-static bool selinux_enabled;
-static /*@null@*/struct selabel_handle *selabel_hnd = NULL;
-
-static void cleanup(void)
-{
-	if (selabel_hnd) {
-		selabel_close(selabel_hnd);
-		selabel_hnd = NULL;
-	}
-}
-
-void reset_selinux_handle (void)
-{
-    cleanup();
-}
-
-/*
- * set_selinux_file_context - Set the security context before any file or
- *                            directory creation.
- *
- *	set_selinux_file_context () should be called before any creation
- *	of file, symlink, directory, ...
- *
- *	Callers may have to Reset SELinux to create files with default
- *	contexts with reset_selinux_file_context
- */
-int set_selinux_file_context (const char *dst_name, mode_t mode)
-{
-	if (!selinux_checked) {
-		selinux_enabled = is_selinux_enabled () > 0;
-		selinux_checked = true;
-	}
-
-	if (selinux_enabled) {
-		/* Get the default security context for this file */
-
-		/*@null@*/char *fcontext_raw = NULL;
-		int r;
-
-		if (selabel_hnd == NULL) {
-			selabel_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
-			if (selabel_hnd == NULL) {
-				return security_getenforce () != 0;
-			}
-			(void) atexit(cleanup);
-		}
-
-		r = selabel_lookup_raw(selabel_hnd, &fcontext_raw, dst_name, mode);
-		if (r < 0) {
-			/* No context specified for the searched path */
-			if (errno == ENOENT) {
-				return 0;
-			}
-
-			return security_getenforce () != 0;
-		}
-
-		/* Set the security context for the next created file */
-		r = setfscreatecon_raw (fcontext_raw);
-		freecon (fcontext_raw);
-		if (r < 0) {
-			return security_getenforce () != 0;
-		}
-	}
-	return 0;
-}
-
-/*
- * reset_selinux_file_context - Reset the security context to the default
- *                              policy behavior
- *
- *	reset_selinux_file_context () should be called after the context
- *	was changed with set_selinux_file_context ()
- */
-int reset_selinux_file_context (void)
-{
-	if (!selinux_checked) {
-		selinux_enabled = is_selinux_enabled () > 0;
-		selinux_checked = true;
-	}
-	if (selinux_enabled) {
-		if (setfscreatecon_raw (NULL) != 0) {
-			return security_getenforce () != 0;
-		}
-	}
-	return 0;
-}
-
-/*
- *  Log callback for libselinux internal error reporting.
- */
-format_attr(printf, 2, 3)
-static int selinux_log_cb (int type, const char *fmt, ...) {
-	va_list ap;
-	char *buf;
-	int r;
-#ifdef WITH_AUDIT
-	static int selinux_audit_fd = -2;
-#endif
-
-	va_start (ap, fmt);
-	r = vasprintf (&buf, fmt, ap);
-	va_end (ap);
-
-	if (r < 0) {
-		return 0;
-	}
-
-#ifdef WITH_AUDIT
-	if (-2 == selinux_audit_fd) {
-		selinux_audit_fd = audit_open ();
-
-		if (-1 == selinux_audit_fd) {
-			/* You get these only when the kernel doesn't have
-			 * audit compiled in. */
-			if (   (errno != EINVAL)
-			    && (errno != EPROTONOSUPPORT)
-			    && (errno != EAFNOSUPPORT)) {
-
-			    (void) fputs (_("Cannot open audit interface.\n"),
-			              shadow_logfd);
-			    SYSLOG ((LOG_WARN, "Cannot open audit interface."));
-			}
-		}
-	}
-
-	if (-1 != selinux_audit_fd) {
-		if (SELINUX_AVC == type) {
-			if (audit_log_user_avc_message (selinux_audit_fd,
-			    AUDIT_USER_AVC, buf, NULL, NULL,
-			    NULL, 0) > 0) {
-				goto skip_syslog;
-			}
-		} else if (SELINUX_ERROR == type) {
-			if (audit_log_user_avc_message (selinux_audit_fd,
-			    AUDIT_USER_SELINUX_ERR, buf, NULL, NULL,
-			    NULL, 0) > 0) {
-				goto skip_syslog;
-			}
-		}
-	}
-#endif
-
-	SYSLOG ((LOG_WARN, "libselinux: %s", buf));
-
-skip_syslog:
-	free (buf);
-
-	return 0;
-}
-
-/*
- * check_selinux_permit - Check whether SELinux grants the given
- *                        operation
- *
- *   Parameter is the SELinux permission name, e.g. rootok
- *
- *   Returns 0 when permission is granted
- *                  or something failed but running in
- *                  permissive mode
- */
-int check_selinux_permit (const char *perm_name)
-{
-	char *user_context_raw;
-	int r;
-
-	if (0 == is_selinux_enabled ()) {
-		return 0;
-	}
-
-	selinux_set_callback (SELINUX_CB_LOG, (union selinux_callback) { .func_log = selinux_log_cb });
-
-	if (getprevcon_raw (&user_context_raw) != 0) {
-		fprintf (shadow_logfd,
-		    _("%s: can not get previous SELinux process context: %s\n"),
-		    shadow_progname, strerror (errno));
-		SYSLOG ((LOG_WARN,
-		    "can not get previous SELinux process context: %s",
-		    strerror (errno)));
-		return (security_getenforce () != 0);
-	}
-
-	r = selinux_check_access (user_context_raw, user_context_raw, "passwd", perm_name, NULL);
-	freecon (user_context_raw);
-	return r;
-}
-
-#else				/* !WITH_SELINUX */
-extern int ISO_C_forbids_an_empty_translation_unit;
-#endif				/* !WITH_SELINUX */
--- a/lib/semanage.c
+++ b/lib/semanage.c
@@ -1,368 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2010       , Jakub Hrozek <jhrozek@redhat.com>
- * SPDX-FileCopyrightText: 2011       , Peter Vrabec <pvrabec@redhat.com>
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ifdef WITH_SELINUX
-
-#include "defines.h"
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <stdio.h>
-#include <stdarg.h>
-#include <selinux/selinux.h>
-#include <semanage/semanage.h>
-#include "prototypes.h"
-
-#include "shadowlog_internal.h"
-
-
-format_attr(printf, 3, 4)
-static void semanage_error_callback (unused void *varg,
-                                     semanage_handle_t *handle,
-                                     const char *fmt, ...)
-{
-	int ret;
-	char * message = NULL;
-	va_list ap;
-
-
-	va_start (ap, fmt);
-	ret = vasprintf (&message, fmt, ap);
-	va_end (ap);
-	if (ret < 0) {
-		/* ENOMEM */
-		return;
-	}
-
-	switch (semanage_msg_get_level (handle)) {
-	case SEMANAGE_MSG_ERR:
-	case SEMANAGE_MSG_WARN:
-		fprintf (shadow_logfd, _("[libsemanage]: %s\n"), message);
-		break;
-	case SEMANAGE_MSG_INFO:
-		/* nop */
-		break;
-	}
-
-	free (message);
-}
-
-
-static semanage_handle_t *semanage_init (void)
-{
-	int ret;
-	semanage_handle_t *handle = NULL;
-
-	handle = semanage_handle_create ();
-	if (NULL == handle) {
-		fprintf (shadow_logfd,
-		         _("Cannot create SELinux management handle\n"));
-		return NULL;
-	}
-
-	semanage_msg_set_callback (handle, semanage_error_callback, NULL);
-
-	ret = semanage_is_managed (handle);
-	if (ret != 1) {
-		fprintf (shadow_logfd, _("SELinux policy not managed\n"));
-		goto fail;
-	}
-
-	ret = semanage_access_check (handle);
-	if (ret < SEMANAGE_CAN_READ) {
-		fprintf (shadow_logfd, _("Cannot read SELinux policy store\n"));
-		goto fail;
-	}
-
-	ret = semanage_connect (handle);
-	if (ret != 0) {
-		fprintf (shadow_logfd,
-		         _("Cannot establish SELinux management connection\n"));
-		goto fail;
-	}
-
-	ret = semanage_begin_transaction (handle);
-	if (ret != 0) {
-		fprintf (shadow_logfd, _("Cannot begin SELinux transaction\n"));
-		goto fail;
-	}
-
-	return handle;
-
-fail:
-	if (handle)
-		semanage_disconnect (handle);
-	semanage_handle_destroy (handle);
-	return NULL;
-}
-
-
-static int semanage_user_mod (semanage_handle_t *handle,
-                              semanage_seuser_key_t *key,
-                              const char *login_name,
-                              const char *seuser_name,
-                              const char *serange)
-{
-	int ret;
-	semanage_seuser_t *seuser = NULL;
-
-	semanage_seuser_query (handle, key, &seuser);
-	if (NULL == seuser) {
-		fprintf (shadow_logfd,
-		         _("Could not query seuser for %s\n"), login_name);
-		ret = 1;
-		goto done;
-	}
-
-	if (serange && semanage_mls_enabled(handle)) {
-		ret = semanage_seuser_set_mlsrange (handle, seuser, serange);
-		if (ret != 0) {
-			fprintf (shadow_logfd,
-			         _("Could not set serange for %s to %s\n"),
-			         login_name, serange);
-			ret = 1;
-			goto done;
-		}
-	}
-
-	ret = semanage_seuser_set_sename (handle, seuser, seuser_name);
-	if (ret != 0) {
-		fprintf (shadow_logfd,
-		         _("Could not set sename for %s\n"),
-		         login_name);
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_seuser_modify_local (handle, key, seuser);
-	if (ret != 0) {
-		fprintf (shadow_logfd,
-		         _("Could not modify login mapping for %s\n"),
-		         login_name);
-		ret = 1;
-		goto done;
-	}
-
-	ret = 0;
-done:
-	semanage_seuser_free (seuser);
-	return ret;
-}
-
-
-static int semanage_user_add (semanage_handle_t *handle,
-                             const semanage_seuser_key_t *key,
-                             const char *login_name,
-                             const char *seuser_name,
-                             const char *serange)
-{
-	int ret;
-	semanage_seuser_t *seuser = NULL;
-
-	ret = semanage_seuser_create (handle, &seuser);
-	if (ret != 0) {
-		fprintf (shadow_logfd,
-		         _("Cannot create SELinux login mapping for %s\n"),
-		         login_name);
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_seuser_set_name (handle, seuser, login_name);
-	if (ret != 0) {
-		fprintf (shadow_logfd, _("Could not set name for %s\n"), login_name);
-		ret = 1;
-		goto done;
-	}
-
-	if (serange && semanage_mls_enabled(handle)) {
-		ret = semanage_seuser_set_mlsrange (handle, seuser, serange);
-		if (ret != 0) {
-			fprintf (shadow_logfd,
-			         _("Could not set serange for %s to %s\n"),
-			         login_name, serange);
-			ret = 1;
-			goto done;
-		}
-	}
-
-	ret = semanage_seuser_set_sename (handle, seuser, seuser_name);
-	if (ret != 0) {
-		fprintf (shadow_logfd,
-		         _("Could not set SELinux user for %s\n"),
-		         login_name);
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_seuser_modify_local (handle, key, seuser);
-	if (ret != 0) {
-		fprintf (shadow_logfd,
-		         _("Could not add login mapping for %s\n"),
-		         login_name);
-		ret = 1;
-		goto done;
-	}
-
-	ret = 0;
-done:
-	semanage_seuser_free (seuser);
-	return ret;
-}
-
-
-int set_seuser (const char *login_name, const char *seuser_name, const char *serange)
-{
-	semanage_handle_t *handle = NULL;
-	semanage_seuser_key_t *key = NULL;
-	int ret;
-	int seuser_exists = 0;
-
-	if (NULL == seuser_name) {
-		/* don't care, just let system pick the defaults */
-		return 0;
-	}
-
-	handle = semanage_init ();
-	if (NULL == handle) {
-		fprintf (shadow_logfd, _("Cannot init SELinux management\n"));
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_seuser_key_create (handle, login_name, &key);
-	if (ret != 0) {
-		fprintf (shadow_logfd, _("Cannot create SELinux user key\n"));
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_seuser_exists (handle, key, &seuser_exists);
-	if (ret < 0) {
-		fprintf (shadow_logfd, _("Cannot verify the SELinux user\n"));
-		ret = 1;
-		goto done;
-	}
-
-	if (0 != seuser_exists) {
-		ret = semanage_user_mod (handle, key, login_name, seuser_name, serange);
-		if (ret != 0) {
-			fprintf (shadow_logfd,
-			         _("Cannot modify SELinux user mapping\n"));
-			ret = 1;
-			goto done;
-		}
-	} else {
-		ret = semanage_user_add (handle, key, login_name, seuser_name, serange);
-		if (ret != 0) {
-			fprintf (shadow_logfd,
-			         _("Cannot add SELinux user mapping\n"));
-			ret = 1;
-			goto done;
-		}
-	}
-
-	ret = semanage_commit (handle);
-	if (ret < 0) {
-		fprintf (shadow_logfd, _("Cannot commit SELinux transaction\n"));
-		ret = 1;
-		goto done;
-	}
-
-	ret = 0;
-	reset_selinux_handle();
-
-done:
-	semanage_seuser_key_free (key);
-	if (handle)
-		semanage_disconnect (handle);
-	semanage_handle_destroy (handle);
-	return ret;
-}
-
-
-int del_seuser (const char *login_name)
-{
-	semanage_handle_t *handle = NULL;
-	semanage_seuser_key_t *key = NULL;
-	int ret;
-	int exists = 0;
-
-	handle = semanage_init ();
-	if (NULL == handle) {
-		fprintf (shadow_logfd, _("Cannot init SELinux management\n"));
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_seuser_key_create (handle, login_name, &key);
-	if (ret != 0) {
-		fprintf (shadow_logfd, _("Cannot create SELinux user key\n"));
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_seuser_exists (handle, key, &exists);
-	if (ret < 0) {
-		fprintf (shadow_logfd, _("Cannot verify the SELinux user\n"));
-		ret = 1;
-		goto done;
-	}
-
-	if (0 == exists) {
-		fprintf (shadow_logfd,
-		         _("Login mapping for %s is not defined, OK if default mapping was used\n"),
-		         login_name);
-		ret = 0;  /* probably default mapping */
-		goto done;
-	}
-
-	ret = semanage_seuser_exists_local (handle, key, &exists);
-	if (ret < 0) {
-		fprintf (shadow_logfd, _("Cannot verify the SELinux user\n"));
-		ret = 1;
-		goto done;
-	}
-
-	if (0 == exists) {
-		fprintf (shadow_logfd,
-		         _("Login mapping for %s is defined in policy, cannot be deleted\n"),
-		         login_name);
-		ret = 0; /* Login mapping defined in policy can't be deleted */
-		goto done;
-	}
-
-	ret = semanage_seuser_del_local (handle, key);
-	if (ret != 0) {
-		fprintf (shadow_logfd,
-		         _("Could not delete login mapping for %s"),
-		         login_name);
-		ret = 1;
-		goto done;
-	}
-
-	ret = semanage_commit (handle);
-	if (ret < 0) {
-		fprintf (shadow_logfd, _("Cannot commit SELinux transaction\n"));
-		ret = 1;
-		goto done;
-	}
-
-	ret = 0;
-done:
-	semanage_seuser_key_free (key);
-	if (handle)
-		semanage_disconnect (handle);
-	semanage_handle_destroy (handle);
-	return ret;
-}
-#else				/* !WITH_SELINUX */
-extern int ISO_C_forbids_an_empty_translation_unit;
-#endif				/* !WITH_SELINUX */
--- a/lib/sgetgrent.c
+++ b/lib/sgetgrent.c
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1998, Marek Michałkiewicz
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -12,10 +35,7 @@
 #ident "$Id$"

 #include <stdio.h>
-#include <sys/types.h>
 #include <grp.h>
-
-#include "alloc.h"
 #include "defines.h"
 #include "prototypes.h"

@@ -36,9 +56,10 @@
 */
 static char **list (char *s)
 {
-	static char **members = NULL;
+	static char **members = 0;
 	static int size = 0;	/* max members + 1 */
 	int i;
+	char **rbuf;

 	i = 0;
 	for (;;) {
@@ -46,28 +67,39 @@ static char **list (char *s)
 		   member name, or terminating NULL).  */
 		if (i >= size) {
 			size = i + 100;	/* at least: i + 1 */
-			members = REALLOCF(members, size, char *);
-			if (!members)
-				return NULL;
+			if (members) {
+				rbuf =
+				    realloc (members, size * sizeof (char *));
+			} else {
+				/* for old (before ANSI C) implementations of
+				   realloc() that don't handle NULL properly */
+				rbuf = malloc (size * sizeof (char *));
+			}
+			if (!rbuf) {
+				if (members)
+					free (members);
+				members = 0;
+				size = 0;
+				return (char **) 0;
+			}
+			members = rbuf;
 		}
 		if (!s || s[0] == '\0')
 			break;
 		members[i++] = s;
-		while (('\0' != *s) && (',' != *s)) {
+		while (*s && *s != ',')
 			s++;
-		}
-		if ('\0' != *s) {
+		if (*s)
 			*s++ = '\0';
-		}
 	}
-	members[i] = NULL;
+	members[i] = (char *) 0;
 	return members;
 }


 struct group *sgetgrent (const char *buf)
 {
-	static char *grpbuf = NULL;
+	static char *grpbuf = 0;
 	static size_t size = 0;
 	static char *grpfields[NFIELDS];
 	static struct group grent;
@@ -77,42 +109,33 @@ struct group *sgetgrent (const char *buf)
 	if (strlen (buf) + 1 > size) {
 		/* no need to use realloc() here - just free it and
 		   allocate a larger block */
-		free (grpbuf);
+		if (grpbuf)
+			free (grpbuf);
 		size = strlen (buf) + 1000;	/* at least: strlen(buf) + 1 */
-		grpbuf = MALLOC(size, char);
-		if (grpbuf == NULL) {
+		grpbuf = malloc (size);
+		if (!grpbuf) {
 			size = 0;
-			return NULL;
+			return 0;
 		}
 	}
 	strcpy (grpbuf, buf);

-	cp = strrchr (grpbuf, '\n');
-	if (NULL != cp) {
+	if ((cp = strrchr (grpbuf, '\n')))
 		*cp = '\0';
-	}

-	for (cp = grpbuf, i = 0; (i < NFIELDS) && (NULL != cp); i++) {
+	for (cp = grpbuf, i = 0; i < NFIELDS && cp; i++) {
 		grpfields[i] = cp;
-		cp = strchr (cp, ':');
-		if (NULL != cp) {
-			*cp = '\0';
-			cp++;
-		}
-	}
-	if (i < (NFIELDS - 1) || *grpfields[2] == '\0' || cp != NULL) {
-		return NULL;
+		if ((cp = strchr (cp, ':')))
+			*cp++ = 0;
 	}
+	if (i < (NFIELDS - 1) || *grpfields[2] == '\0')
+		return 0;
 	grent.gr_name = grpfields[0];
 	grent.gr_passwd = grpfields[1];
-	if (get_gid (grpfields[2], &grent.gr_gid) == 0) {
-		return NULL;
-	}
+	grent.gr_gid = atoi (grpfields[2]);
 	grent.gr_mem = list (grpfields[3]);
-	if (NULL == grent.gr_mem) {
-		return NULL;	/* out of memory */
-	}
+	if (!grent.gr_mem)
+		return (struct group *) 0;	/* out of memory */

 	return &grent;
 }
-
--- a/lib/sgetpwent.c
+++ b/lib/sgetpwent.c
@@ -1,10 +1,33 @@
 /*
- * SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
+ * Copyright (c) 1989 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1998, Marek Michałkiewicz
+ * Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -16,7 +39,6 @@
 #include <stdio.h>
 #include <pwd.h>
 #include "prototypes.h"
-#include "shadowlog_internal.h"

 #define	NFIELDS	7

@@ -35,9 +57,10 @@
 struct passwd *sgetpwent (const char *buf)
 {
 	static struct passwd pwent;
-	static char pwdbuf[PASSWD_ENTRY_MAX_LENGTH];
-	int i;
-	char *cp;
+	static char pwdbuf[1024];
+	register int i;
+	register char *cp;
+	char *ep;
 	char *fields[NFIELDS];

 	/*
@@ -45,12 +68,8 @@ struct passwd *sgetpwent (const char *buf)
 	 * the password structure remain valid.
 	 */

-	if (strlen (buf) >= sizeof pwdbuf) {
-		fprintf (shadow_logfd,
-		         "%s: Too long passwd entry encountered, file corruption?\n",
-		         shadow_progname);
+	if (strlen (buf) >= sizeof pwdbuf)
 		return 0;	/* fail if too long */
-	}
 	strcpy (pwdbuf, buf);

 	/*
@@ -58,23 +77,15 @@ struct passwd *sgetpwent (const char *buf)
 	 * field.  The fields are converted into NUL terminated strings.
 	 */

-	for (cp = pwdbuf, i = 0; (i < NFIELDS) && (NULL != cp); i++) {
+	for (cp = pwdbuf, i = 0; i < NFIELDS && cp; i++) {
 		fields[i] = cp;
-		while (('\0' != *cp) && (':' != *cp)) {
-			cp++;
-		}
+		while (*cp && *cp != ':')
+			++cp;

-		if ('\0' != *cp) {
-			*cp = '\0';
-			cp++;
-		} else {
-			cp = NULL;
-		}
-	}
-
-	/* something at the end, columns over shot */
-	if ( cp != NULL ) {
-		return( NULL );
+		if (*cp)
+			*cp++ = '\0';
+		else
+			cp = 0;
 	}

 	/*
@@ -83,7 +94,7 @@ struct passwd *sgetpwent (const char *buf)
 	 */

 	if (i != NFIELDS || *fields[2] == '\0' || *fields[3] == '\0')
-		return NULL;
+		return 0;

 	/*
 	 * Each of the fields is converted the appropriate data type
@@ -94,11 +105,13 @@ struct passwd *sgetpwent (const char *buf)

 	pwent.pw_name = fields[0];
 	pwent.pw_passwd = fields[1];
-	if (get_uid (fields[2], &pwent.pw_uid) == 0) {
-		return NULL;
+	if (fields[2][0] == '\0' ||
+	    ((pwent.pw_uid = strtol (fields[2], &ep, 10)) == 0 && *ep)) {
+		return 0;
 	}
-	if (get_gid (fields[3], &pwent.pw_gid) == 0) {
-		return NULL;
+	if (fields[3][0] == '\0' ||
+	    ((pwent.pw_gid = strtol (fields[3], &ep, 10)) == 0 && *ep)) {
+		return 0;
 	}
 	pwent.pw_gecos = fields[4];
 	pwent.pw_dir = fields[5];
@@ -106,4 +119,3 @@ struct passwd *sgetpwent (const char *buf)

 	return &pwent;
 }
-
--- a/lib/sgetspent.c
+++ b/lib/sgetspent.c
@@ -1,22 +1,40 @@
 /*
- * SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2009       , Nicolas François
+ * Copyright (c) 1989 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 1998, Marek Michałkiewicz
+ * Copyright (c) 2003 - 2005, Tomasz Kłoczko
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>

-/* Newer versions of Linux libc already have shadow support.  */
-#ifndef HAVE_SGETSPENT
-
 #ident "$Id$"

 #include <sys/types.h>
 #include "prototypes.h"
-#include "shadowlog_internal.h"
 #include "defines.h"
 #include <stdio.h>
 #define	FIELDS	9
@@ -26,10 +44,11 @@
 */
 struct spwd *sgetspent (const char *string)
 {
-	static char spwbuf[PASSWD_ENTRY_MAX_LENGTH];
+	static char spwbuf[1024];
 	static struct spwd spwd;
 	char *fields[FIELDS];
 	char *cp;
+	char *cpp;
 	int i;

 	/*
@@ -37,44 +56,32 @@ struct spwd *sgetspent (const char *string)
 	 * have to do that to our private copy.
 	 */

-	if (strlen (string) >= sizeof spwbuf) {
-		fprintf (shadow_logfd,
-		         "%s: Too long passwd entry encountered, file corruption?\n",
-		         shadow_progname);
+	if (strlen (string) >= sizeof spwbuf)
 		return 0;	/* fail if too long */
-	}
 	strcpy (spwbuf, string);

-	cp = strrchr (spwbuf, '\n');
-	if (NULL != cp) {
+	if ((cp = strrchr (spwbuf, '\n')))
 		*cp = '\0';
-	}

 	/*
 	 * Tokenize the string into colon separated fields.  Allow up to
 	 * FIELDS different fields.
 	 */

-	for (cp = spwbuf, i = 0; ('\0' != *cp) && (i < FIELDS); i++) {
+	for (cp = spwbuf, i = 0; *cp && i < FIELDS; i++) {
 		fields[i] = cp;
-		while (('\0' != *cp) && (':' != *cp)) {
+		while (*cp && *cp != ':')
 			cp++;
-		}

-		if ('\0' != *cp) {
-			*cp = '\0';
-			cp++;
-		}
+		if (*cp)
+			*cp++ = '\0';
 	}

-	if (i == (FIELDS - 1)) {
+	if (i == (FIELDS - 1))
 		fields[i++] = cp;
-	}

-	if ( ((NULL != cp) && ('\0' != *cp)) ||
-	     ((i != FIELDS) && (i != OFIELDS)) ) {
+	if ((cp && *cp) || (i != FIELDS && i != OFIELDS))
 		return 0;
-	}

 	/*
 	 * Start populating the structure.  The fields are all in
@@ -90,34 +97,28 @@ struct spwd *sgetspent (const char *string)
 	 * incorrectly formatted number.
 	 */

-	if (fields[2][0] == '\0') {
-		spwd.sp_lstchg = -1;
-	} else if (   (getlong (fields[2], &spwd.sp_lstchg) == 0)
-	           || (spwd.sp_lstchg < 0)) {
+	if ((spwd.sp_lstchg = strtol (fields[2], &cpp, 10)) == 0 && *cpp) {
 		return 0;
-	}
+	} else if (fields[2][0] == '\0')
+		spwd.sp_lstchg = -1;

 	/*
 	 * Get the minimum period between password changes.
 	 */

-	if (fields[3][0] == '\0') {
-		spwd.sp_min = -1;
-	} else if (   (getlong (fields[3], &spwd.sp_min) == 0)
-	           || (spwd.sp_min < 0)) {
+	if ((spwd.sp_min = strtol (fields[3], &cpp, 10)) == 0 && *cpp) {
 		return 0;
-	}
+	} else if (fields[3][0] == '\0')
+		spwd.sp_min = -1;

 	/*
 	 * Get the maximum number of days a password is valid.
 	 */

-	if (fields[4][0] == '\0') {
-		spwd.sp_max = -1;
-	} else if (   (getlong (fields[4], &spwd.sp_max) == 0)
-	           || (spwd.sp_max < 0)) {
+	if ((spwd.sp_max = strtol (fields[4], &cpp, 10)) == 0 && *cpp) {
 		return 0;
-	}
+	} else if (fields[4][0] == '\0')
+		spwd.sp_max = -1;

 	/*
 	 * If there are only OFIELDS fields (this is a SVR3.2 /etc/shadow
@@ -125,10 +126,8 @@ struct spwd *sgetspent (const char *string)
 	 */

 	if (i == OFIELDS) {
-		spwd.sp_warn   = -1;
-		spwd.sp_inact  = -1;
-		spwd.sp_expire = -1;
-		spwd.sp_flag   = SHADOW_SP_FLAG_UNSET;
+		spwd.sp_warn = spwd.sp_inact = spwd.sp_expire =
+		    spwd.sp_flag = -1;

 		return &spwd;
 	}
@@ -137,51 +136,40 @@ struct spwd *sgetspent (const char *string)
 	 * Get the number of days of password expiry warning.
 	 */

-	if (fields[5][0] == '\0') {
-		spwd.sp_warn = -1;
-	} else if (   (getlong (fields[5], &spwd.sp_warn) == 0)
-	           || (spwd.sp_warn < 0)) {
+	if ((spwd.sp_warn = strtol (fields[5], &cpp, 10)) == 0 && *cpp) {
 		return 0;
-	}
+	} else if (fields[5][0] == '\0')
+		spwd.sp_warn = -1;

 	/*
 	 * Get the number of days of inactivity before an account is
 	 * disabled.
 	 */

-	if (fields[6][0] == '\0') {
-		spwd.sp_inact = -1;
-	} else if (   (getlong (fields[6], &spwd.sp_inact) == 0)
-	           || (spwd.sp_inact < 0)) {
+	if ((spwd.sp_inact = strtol (fields[6], &cpp, 10)) == 0 && *cpp) {
 		return 0;
-	}
+	} else if (fields[6][0] == '\0')
+		spwd.sp_inact = -1;

 	/*
 	 * Get the number of days after the epoch before the account is
 	 * set to expire.
 	 */

-	if (fields[7][0] == '\0') {
-		spwd.sp_expire = -1;
-	} else if (   (getlong (fields[7], &spwd.sp_expire) == 0)
-	           || (spwd.sp_expire < 0)) {
+	if ((spwd.sp_expire = strtol (fields[7], &cpp, 10)) == 0 && *cpp) {
 		return 0;
-	}
+	} else if (fields[7][0] == '\0')
+		spwd.sp_expire = -1;

 	/*
 	 * This field is reserved for future use.  But it isn't supposed
 	 * to have anything other than a valid integer in it.
 	 */

-	if (fields[8][0] == '\0') {
-		spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
-	} else if (getulong (fields[8], &spwd.sp_flag) == 0) {
+	if ((spwd.sp_flag = strtol (fields[8], &cpp, 10)) == 0 && *cpp) {
 		return 0;
-	}
+	} else if (fields[8][0] == '\0')
+		spwd.sp_flag = -1;

 	return (&spwd);
 }
-#else
-extern int ISO_C_forbids_an_empty_translation_unit;
-#endif
-
--- a/lib/sgroupio.c
+++ b/lib/sgroupio.c
@@ -1,11 +1,34 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001       , Michał Moskal
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2013, Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001       , Michał Moskal
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2007 - 2008, Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #include <config.h>
@@ -14,132 +37,71 @@

 #ident "$Id$"

-#include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "commonio.h"
-#include "getdef.h"
 #include "sgroupio.h"

-/*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent)
+struct sgrp *__sgr_dup (const struct sgrp *sgent)
 {
 	struct sgrp *sg;
 	int i;

-	sg = CALLOC (1, struct sgrp);
-	if (NULL == sg) {
+	if (!(sg = (struct sgrp *) malloc (sizeof *sg)))
 		return NULL;
-	}
-	/* Do the same as the other _dup function, even if we know the
-	 * structure. */
-	/*@-mustfreeonly@*/
-	sg->sg_name = strdup (sgent->sg_name);
-	/*@=mustfreeonly@*/
-	if (NULL == sg->sg_name) {
-		free (sg);
+	*sg = *sgent;
+	if (!(sg->sg_name = strdup (sgent->sg_name)))
 		return NULL;
-	}
-	/*@-mustfreeonly@*/
-	sg->sg_passwd = strdup (sgent->sg_passwd);
-	/*@=mustfreeonly@*/
-	if (NULL == sg->sg_passwd) {
-		free (sg->sg_name);
-		free (sg);
+	if (!(sg->sg_passwd = strdup (sgent->sg_passwd)))
 		return NULL;
-	}

-	for (i = 0; NULL != sgent->sg_adm[i]; i++);
-	/*@-mustfreeonly@*/
-	sg->sg_adm = MALLOC(i + 1, char *);
-	/*@=mustfreeonly@*/
-	if (NULL == sg->sg_adm) {
-		free (sg->sg_passwd);
-		free (sg->sg_name);
-		free (sg);
+	for (i = 0; sgent->sg_adm[i]; i++);
+	sg->sg_adm = (char **) malloc ((i + 1) * sizeof (char *));
+	if (!sg->sg_adm)
 		return NULL;
-	}
-	for (i = 0; NULL != sgent->sg_adm[i]; i++) {
+	for (i = 0; sgent->sg_adm[i]; i++) {
 		sg->sg_adm[i] = strdup (sgent->sg_adm[i]);
-		if (NULL == sg->sg_adm[i]) {
-			for (i = 0; NULL != sg->sg_adm[i]; i++) {
-				free (sg->sg_adm[i]);
-			}
-			free (sg->sg_adm);
-			free (sg->sg_passwd);
-			free (sg->sg_name);
-			free (sg);
+		if (!sg->sg_adm[i])
 			return NULL;
-		}
 	}
 	sg->sg_adm[i] = NULL;

-	for (i = 0; NULL != sgent->sg_mem[i]; i++);
-	/*@-mustfreeonly@*/
-	sg->sg_mem = MALLOC(i + 1, char *);
-	/*@=mustfreeonly@*/
-	if (NULL == sg->sg_mem) {
-		for (i = 0; NULL != sg->sg_adm[i]; i++) {
-			free (sg->sg_adm[i]);
-		}
-		free (sg->sg_adm);
-		free (sg->sg_passwd);
-		free (sg->sg_name);
-		free (sg);
+	for (i = 0; sgent->sg_mem[i]; i++);
+	sg->sg_mem = (char **) malloc ((i + 1) * sizeof (char *));
+	if (!sg->sg_mem)
 		return NULL;
-	}
-	for (i = 0; NULL != sgent->sg_mem[i]; i++) {
+	for (i = 0; sgent->sg_mem[i]; i++) {
 		sg->sg_mem[i] = strdup (sgent->sg_mem[i]);
-		if (NULL == sg->sg_mem[i]) {
-			for (i = 0; NULL != sg->sg_mem[i]; i++) {
-				free (sg->sg_mem[i]);
-			}
-			free (sg->sg_mem);
-			for (i = 0; NULL != sg->sg_adm[i]; i++) {
-				free (sg->sg_adm[i]);
-			}
-			free (sg->sg_adm);
-			free (sg->sg_passwd);
-			free (sg->sg_name);
-			free (sg);
+		if (!sg->sg_mem[i])
 			return NULL;
-		}
 	}
 	sg->sg_mem[i] = NULL;

 	return sg;
 }

-static /*@null@*/ /*@only@*/void *gshadow_dup (const void *ent)
+static void *gshadow_dup (const void *ent)
 {
 	const struct sgrp *sg = ent;

 	return __sgr_dup (sg);
 }

-static void gshadow_free (/*@out@*/ /*@only@*/void *ent)
+static void gshadow_free (void *ent)
 {
 	struct sgrp *sg = ent;

-	sgr_free (sg);
-}
-
-void sgr_free (/*@out@*/ /*@only@*/struct sgrp *sgent)
-{
-	size_t i;
-	free (sgent->sg_name);
-	if (NULL != sgent->sg_passwd) {
-		strzero (sgent->sg_passwd);
-		free (sgent->sg_passwd);
+	free (sg->sg_name);
+	free (sg->sg_passwd);
+	while (*(sg->sg_adm)) {
+		free (*(sg->sg_adm));
+		sg->sg_adm++;
 	}
-	for (i = 0; NULL != sgent->sg_adm[i]; i++) {
-		free (sgent->sg_adm[i]);
+	while (*(sg->sg_mem)) {
+		free (*(sg->sg_mem));
+		sg->sg_mem++;
 	}
-	free (sgent->sg_adm);
-	for (i = 0; NULL != sgent->sg_mem[i]; i++) {
-		free (sgent->sg_mem[i]);
-	}
-	free (sgent->sg_mem);
-	free (sgent);
+	free (sg);
 }

 static const char *gshadow_getname (const void *ent)
@@ -151,39 +113,13 @@ static const char *gshadow_getname (const void *ent)

 static void *gshadow_parse (const char *line)
 {
-	return sgetsgent (line);
+	return (void *) sgetsgent (line);
 }

 static int gshadow_put (const void *ent, FILE * file)
 {
 	const struct sgrp *sg = ent;

-	if (   (NULL == sg)
-	    || (valid_field (sg->sg_name, ":\n") == -1)
-	    || (valid_field (sg->sg_passwd, ":\n") == -1)) {
-		return -1;
-	}
-
-	/* FIXME: fail also if sg->sg_adm == NULL ?*/
-	if (NULL != sg->sg_adm) {
-		size_t i;
-		for (i = 0; NULL != sg->sg_adm[i]; i++) {
-			if (valid_field (sg->sg_adm[i], ",:\n") == -1) {
-				return -1;
-			}
-		}
-	}
-
-	/* FIXME: fail also if sg->sg_mem == NULL ?*/
-	if (NULL != sg->sg_mem) {
-		size_t i;
-		for (i = 0; NULL != sg->sg_mem[i]; i++) {
-			if (valid_field (sg->sg_mem[i], ",:\n") == -1) {
-				return -1;
-			}
-		}
-	}
-
 	return (putsgent (sg, file) == -1) ? -1 : 0;
 }

@@ -206,33 +142,22 @@ static struct commonio_db gshadow_db = {
 #ifdef WITH_SELINUX
 	NULL,			/* scontext */
 #endif
-	0400,                   /* st_mode */
-	0,                      /* st_uid */
-	0,                      /* st_gid */
 	NULL,			/* head */
 	NULL,			/* tail */
 	NULL,			/* cursor */
-	false,			/* changed */
-	false,			/* isopen */
-	false,			/* locked */
-	false,			/* readonly */
-	false			/* setname */
+	0,			/* changed */
+	0,			/* isopen */
+	0,			/* locked */
+	0			/* readonly */
 };

-int sgr_setdbname (const char *filename)
+int sgr_name (const char *filename)
 {
 	return commonio_setname (&gshadow_db, filename);
 }

-/*@observer@*/const char *sgr_dbname (void)
+int sgr_file_present (void)
 {
-	return gshadow_db.filename;
-}
-
-bool sgr_file_present (void)
-{
-	if (getdef_bool ("FORCE_SHADOW"))
-		return true;
 	return commonio_present (&gshadow_db);
 }

@@ -246,14 +171,14 @@ int sgr_open (int mode)
 	return commonio_open (&gshadow_db, mode);
 }

-/*@observer@*/ /*@null@*/const struct sgrp *sgr_locate (const char *name)
+const struct sgrp *sgr_locate (const char *name)
 {
 	return commonio_locate (&gshadow_db, name);
 }

 int sgr_update (const struct sgrp *sg)
 {
-	return commonio_update (&gshadow_db, sg);
+	return commonio_update (&gshadow_db, (const void *) sg);
 }

 int sgr_remove (const char *name)
@@ -266,7 +191,7 @@ int sgr_rewind (void)
 	return commonio_rewind (&gshadow_db);
 }

-/*@null@*/const struct sgrp *sgr_next (void)
+const struct sgrp *sgr_next (void)
 {
 	return commonio_next (&gshadow_db);
 }
@@ -283,10 +208,10 @@ int sgr_unlock (void)

 void __sgr_set_changed (void)
 {
-	gshadow_db.changed = true;
+	gshadow_db.changed = 1;
 }

-/*@dependent@*/ /*@null@*/struct commonio_entry *__sgr_get_head (void)
+struct commonio_entry *__sgr_get_head (void)
 {
 	return gshadow_db.head;
 }
@@ -302,5 +227,5 @@ int sgr_sort ()
 	return commonio_sort_wrt (&gshadow_db, __gr_get_db ());
 }
 #else
-extern int ISO_C_forbids_an_empty_translation_unit;
+extern int errno;		/* warning: ANSI C forbids an empty source file */
 #endif
--- a/lib/sgroupio.h
+++ b/lib/sgroupio.h
@@ -1,29 +1,46 @@
 /*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001       , Michał Moskal
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2001       , Michał Moskal
+ * Copyright (c) 2005       , Tomasz Kłoczko
+ * Copyright (c) 2008       , Nicolas François
+ * All rights reserved.
 *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-/* $Id$ */
-#ifndef _SGROUPIO_H
-#define _SGROUPIO_H
-
 extern int sgr_close (void);
-extern bool sgr_file_present (void);
-extern /*@observer@*/ /*@null@*/const struct sgrp *sgr_locate (const char *name);
+extern int sgr_file_present (void);
+extern const struct sgrp *sgr_locate (const char *);
 extern int sgr_lock (void);
-extern int sgr_setdbname (const char *filename);
-extern /*@observer@*/const char *sgr_dbname (void);
-extern /*@null@*/const struct sgrp *sgr_next (void);
-extern int sgr_open (int mode);
-extern int sgr_remove (const char *name);
+extern int sgr_name (const char *);
+extern const struct sgrp *sgr_next (void);
+extern int sgr_open (int);
+extern int sgr_remove (const char *);
 extern int sgr_rewind (void);
 extern int sgr_unlock (void);
-extern int sgr_update (const struct sgrp *sg);
+extern int sgr_update (const struct sgrp *);
 extern int sgr_sort (void);

-#endif
--- a/Show More
+++ b/Show More