Description: Remove /sbin from the CF3_PATH_ROOT_PROG macro PATH override
 This ensures system tools can be invoked on usr-merged and non-usr-merged systems.
Author: Hugh McMaster <hugh.mcmaster@outlook.com>
Bug-Debian: https://bugs.debian.org/992662
Forwarded: not-needed
Last-Update: 2022-09-09

--- a/configure.ac
+++ b/configure.ac
@@ -906,7 +906,7 @@ AC_CHECK_DECLS(closefrom, [], [], [[#inc
 AC_CHECK_HEADERS([sys/pstat.h])
 AC_CHECK_FUNCS(pstat_getfile2)
 
-CF3_PATH_ROOT_PROG([CHPASSWD], [chpasswd], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([CHPASSWD], [chpasswd], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$CHPASSWD" != "x"],
       [AC_DEFINE(HAVE_CHPASSWD, 1, [Define if chpasswd tool is present])]
       [AC_DEFINE_UNQUOTED(CHPASSWD, ["$CHPASSWD"], [Path to chpasswd tool])]
@@ -919,19 +919,19 @@ AS_IF([test "x$PWDADM" != "x"],
       [AC_DEFINE_UNQUOTED(PWDADM, ["$PWDADM"], [Path to pwdadm tool])]
      )
 
-CF3_PATH_ROOT_PROG([USERADD], [useradd], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([USERADD], [useradd], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$USERADD" != "x"],
       [AC_DEFINE(HAVE_USERADD, 1, [Define if useradd tool is present])]
       [AC_DEFINE_UNQUOTED(USERADD, ["$USERADD"], [Path to useradd tool])]
      )
 
-CF3_PATH_ROOT_PROG([USERMOD], [usermod], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([USERMOD], [usermod], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$USERMOD" != "x"],
       [AC_DEFINE(HAVE_USERMOD, 1, [Define if usermod tool is present])]
       [AC_DEFINE_UNQUOTED(USERMOD, ["$USERMOD"], [Path to usermod tool])]
      )
 
-CF3_PATH_ROOT_PROG([USERDEL], [userdel], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([USERDEL], [userdel], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$USERDEL" != "x"],
       [AC_DEFINE(HAVE_USERDEL, 1, [Define if userdel tool is present])]
       [AC_DEFINE_UNQUOTED(USERDEL, ["$USERDEL"], [Path to userdel tool])]
--- a/libntech/configure.ac
+++ b/libntech/configure.ac
@@ -594,7 +594,7 @@ AC_REPLACE_FUNCS(closefrom)
 AC_CHECK_HEADERS([sys/pstat.h])
 AC_CHECK_FUNCS(pstat_getfile2)
 
-CF3_PATH_ROOT_PROG([CHPASSWD], [chpasswd], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([CHPASSWD], [chpasswd], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$CHPASSWD" != "x"],
       [AC_DEFINE(HAVE_CHPASSWD, 1, [Define if chpasswd tool is present])]
       [AC_DEFINE_UNQUOTED(CHPASSWD, ["$CHPASSWD"], [Path to chpasswd tool])]
@@ -607,19 +607,19 @@ AS_IF([test "x$PWDADM" != "x"],
       [AC_DEFINE_UNQUOTED(PWDADM, ["$PWDADM"], [Path to pwdadm tool])]
      )
 
-CF3_PATH_ROOT_PROG([USERADD], [useradd], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([USERADD], [useradd], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$USERADD" != "x"],
       [AC_DEFINE(HAVE_USERADD, 1, [Define if useradd tool is present])]
       [AC_DEFINE_UNQUOTED(USERADD, ["$USERADD"], [Path to useradd tool])]
      )
 
-CF3_PATH_ROOT_PROG([USERMOD], [usermod], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([USERMOD], [usermod], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$USERMOD" != "x"],
       [AC_DEFINE(HAVE_USERMOD, 1, [Define if usermod tool is present])]
       [AC_DEFINE_UNQUOTED(USERMOD, ["$USERMOD"], [Path to usermod tool])]
      )
 
-CF3_PATH_ROOT_PROG([USERDEL], [userdel], [], [/sbin:/usr/sbin:/bin:/usr/bin:$PATH])
+CF3_PATH_ROOT_PROG([USERDEL], [userdel], [], [/usr/sbin:/bin:/usr/bin:$PATH])
 AS_IF([test "x$USERDEL" != "x"],
       [AC_DEFINE(HAVE_USERDEL, 1, [Define if userdel tool is present])]
       [AC_DEFINE_UNQUOTED(USERDEL, ["$USERDEL"], [Path to userdel tool])]