Merge a2b9361 into f8ecd52

Author: jimklimov

NEWS.adoc

@@ -263,6 +263,12 @@ several `FSD` notifications into one executed action. [PR #3097]
    include the source distribution (was posted for NUT v2.8.1 and v2.8.2
    tagged releases, but absent for v2.8.3 and v2.8.4). [#3056]
 
+ - The `configure` script would now probe (if it can) the operating systems for
+   more user and group account names, such as `upsmon`, `nutmon`, `ups`, `nut`
+   (last hit wins, separately for user and groups accounts) settling on one of
+   those if detected instead of `nobody` (and optionally `nogroup`). It would
+   also warn if `nobody` or `nogroup` end up being used for a build. [#3173]
+
  - Updated `make spellcheck` to help avoid asciidoc admonition blocks with
    visually invalid sentences (after rendering as a box in HTML or PDF). [#3077]
 

UPGRADING.adoc

@@ -71,6 +71,15 @@ Changes from 2.8.4 to 2.8.5
   to match the driver program name. Packaging recipes may have to be updated.
   Follow-up from slightly botched renaming in original contribution. [PR #545]
 
+- The `configure` script would now probe (if it can) the operating systems for
+  more user and group account names, such as `upsmon`, `nutmon`, `ups`, `nut`
+  (last hit wins, separately for user and groups accounts) settling on one of
+  those if detected instead of `nobody` (and optionally `nogroup`). It would
+  also warn if `nobody` or `nogroup` end up being used for a build. This is
+  not likely to affect package builds (which usually define the accounts to
+  use), but may (hopefully positively) affect rebuilds of NUT on systems where
+  an older version is already deployed. [#3173]
+
 - The `configure` script should now try harder to report specifically
   the "purelib" location as `PYTHON*_SITE_PACKAGES`. Packaging recipes
   may have to be updated. [#1209]

configure.ac

@@ -509,6 +509,13 @@ AS_IF([test -n "`${PROBE_OS_GROUP} nogroup`" && test -z "`${PROBE_OS_GROUP} "${R
 	[RUN_AS_GROUP="nogroup"]
 )
 
+dnl Last hit wins, user and groups accounts separately
+for TOKEN in upsmon nutmon ups nut; do
+	AS_IF([test -n "`${PROBE_OS_USER} ${TOKEN}`"], [RUN_AS_USER="${TOKEN}"])
+	AS_IF([test -n "`${PROBE_OS_GROUP} ${TOKEN}`"], [RUN_AS_GROUP="${TOKEN}"])
+done
+unset TOKEN
+
 dnl NOTE: NUT legacy default, keep as is for least surprise
 dnl Distributions are however welcome to specify the option to use tmpfs
 AS_CASE([${target_os}],
@@ -6943,6 +6950,12 @@ AS_IF([test -s "${ABS_TOP_SRCDIR}/install-sh" && ${GREP} -w MKDIRPROG "${ABS_TOP
 	])
 ])
 
+AS_IF([test x"${RUN_AS_USER}" = xnobody || test x"${RUN_AS_GROUP}" = xnobody || test x"${RUN_AS_GROUP}" = xnogroup], [
+	AC_MSG_NOTICE([==========================================================])
+	AC_MSG_NOTICE([You have configured a build for default user '${RUN_AS_USER}' or])
+	AC_MSG_NOTICE([group '${RUN_AS_GROUP}' account names. This may be not safe.])
+])
+
 AS_IF([test x"${NUT_VERSION_DEPLOYED-}" = x"<reenter>"], [
 	AC_MSG_NOTICE([==========================================================])
 	AC_MSG_NOTICE([You have configured a build for "in-place" replacement])

docs/configure.txt

@@ -820,6 +820,12 @@ This was done since it's slightly better than staying around as
 hack for NFS access.  You should create at least one separate user
 for this software.
 
+Starting from NUT v2.8.5, further default user and group account names
+are probed in the operating system (which might exist if a different
+version of NUT was already installed before the build), currently trying
+`upsmon`, `nutmon`, `ups` or `nut` (last hit wins, separately for groups
+and users).
+
 When such NUT daemons `setuid()` to some user account (whether built-in,
 or specified in configuration files, or passed on command line), they
 also typically assume that account's primary group via `setgid()`.