Separate cache owner from --enable-setuid option

It's useful to have a notion of the cache owner even when man is not
installed setuid.  --enable-setuid no longer takes an argument, and the
owner is now set by the --enable-cache-owner option instead.

* m4/man-arg-cache-owner.m4: New file.
* m4/man-arg-setuid.m4: Stop accepting an argument.  Only set man_mode,
not man_owner.
* configure.ac: Call MAN_ARG_CACHE_OWNER.
* src/Makefile.am (install-exec-hook): Only chown man and mandb if
man_mode is 4755 (as well as the existing test for man_owner being
non-empty).

1 files changed, 38 insertions, 11 deletions

diff --git a/configure b/configure
index 9219bd2d..90db93e7 100755
--- a/configure
+++ b/configure
@@ -1678,6 +1678,7 @@ with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_cache_owner
 enable_setuid
 enable_undoc
 with_device
@@ -2374,7 +2375,11 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-setuid=ARG     install man setuid to user ARG [ARG=man]
+  --enable-cache-owner=ARG
+                          make system-wide cache files be owned by user ARG
+                          [arg=man]
+  --disable-cache-owner   don't constrain ownership of system-wide cache files
+  --enable-setuid         install man setuid
   --disable-setuid        don't install man setuid
   --enable-undoc=COMMAND  suggest COMMAND for missing manual pages
   --enable-automatic-create
@@ -13782,23 +13787,21 @@ roff_version=`echo 2.7.5 | sed 's/-/\\-/g'`
 # The autoconf literature states that only features that can be separately
 # 'built' should use --enable and friends. Oh well...
 
-# Check whether --enable-setuid was given.
-if test "${enable_setuid+set}" = set; then :
-  enableval=$enable_setuid; if test "$enableval" = "yes"
+# Check whether --enable-cache-owner was given.
+if test "${enable_cache_owner+set}" = set; then :
+  enableval=$enable_cache_owner; if test "$enableval" = "yes"
 	   then
 		enableval=man
 	   fi
 	   if test "$enableval" = "no"
 	   then
 		man_owner=
-		man_mode="755"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will not be installed setuid" >&5
-$as_echo "$as_me: Man will not be installed setuid" >&6;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: System-wide cache files will have unconstrained ownership" >&5
+$as_echo "$as_me: System-wide cache files will have unconstrained ownership" >&6;}
 	   else
 		man_owner=$enableval
-		man_mode="4755"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will be installed setuid $enableval" >&5
-$as_echo "$as_me: Man will be installed setuid $enableval" >&6;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: System-wide cache files will be owned by $enableval" >&5
+$as_echo "$as_me: System-wide cache files will be owned by $enableval" >&6;}
 
 cat >>confdefs.h <<_ACEOF
 #define SECURE_MAN_UID "$man_owner"
@@ -13807,7 +13810,6 @@ _ACEOF
 	   fi
 else
   man_owner=man
-	   man_mode="4755"
 	   cat >>confdefs.h <<_ACEOF
 #define SECURE_MAN_UID "$man_owner"
 _ACEOF
@@ -13817,6 +13819,31 @@ fi
 
 
 
+# Check whether --enable-setuid was given.
+if test "${enable_setuid+set}" = set; then :
+  enableval=$enable_setuid; if test "$enableval" = "yes"
+	   then
+		if test -z "$man_owner"
+		then
+			as_fn_error $? "--enable-setuid is incompatible with --disable-cache-owner" "$LINENO" 5
+		fi
+		man_mode="4755"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will be installed setuid $man_owner" >&5
+$as_echo "$as_me: Man will be installed setuid $man_owner" >&6;}
+	   elif test "$enableval" = "no"
+	   then
+		man_mode="755"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will not be installed setuid" >&5
+$as_echo "$as_me: Man will not be installed setuid" >&6;}
+	   else
+		as_fn_error $? "--enable-setuid=$enableval is no longer valid; consider --enable-cache-owner=$enableval --enable-setuid instead" "$LINENO" 5
+	   fi
+else
+  man_mode="4755"
+fi
+
+
+
 
 # Check whether --enable-undoc was given.
 if test "${enable_undoc+set}" = set; then :