Commit dbde1381 authored by Ulrich Müller's avatar Ulrich Müller
Browse files

configure --with-gameuser now defaults to games group.

* configure.ac (--with-gameuser): Default to 'games' group instead
of 'games' user.
* lisp/play/gamegrid.el: Update comment to reflect that the
'update-game-score' helper program is now setgid by default.
parent 19ee7875
2015-02-08 Ulrich Müller <ulm@gentoo.org>
* configure.ac (--with-gameuser): Default to 'games' group instead
of 'games' user.
2015-02-04 Paul Eggert <eggert@cs.ucla.edu> 2015-02-04 Paul Eggert <eggert@cs.ucla.edu>
* .gitattributes: Ignore blanks at EOL in texinfo.tex. * .gitattributes: Ignore blanks at EOL in texinfo.tex.
......
...@@ -397,17 +397,12 @@ AC_ARG_WITH(gameuser,dnl ...@@ -397,17 +397,12 @@ AC_ARG_WITH(gameuser,dnl
An argument prefixed by ':' specifies a group instead.])]) An argument prefixed by ':' specifies a group instead.])])
gameuser= gameuser=
gamegroup= gamegroup=
# We don't test if we can actually chown/chgrp here, because configure
# may run without root privileges. lib-src/Makefile.in will handle
# any errors due to missing user/group gracefully.
case ${with_gameuser} in case ${with_gameuser} in
no) ;; no) ;;
"" | yes) "" | yes) gamegroup=games ;;
AC_MSG_CHECKING([whether a 'games' user exists])
if id -u games >/dev/null 2>&1; then
AC_MSG_RESULT([yes])
gameuser=games
else
AC_MSG_RESULT([no])
fi
;;
:*) gamegroup=`echo "${with_gameuser}" | sed -e "s/://"` ;; :*) gamegroup=`echo "${with_gameuser}" | sed -e "s/://"` ;;
*) gameuser=${with_gameuser} ;; *) gameuser=${with_gameuser} ;;
esac esac
......
...@@ -53,7 +53,7 @@ build with 'make V=1'. ...@@ -53,7 +53,7 @@ build with 'make V=1'.
group instead of a user if its argument is prefixed by ':' (a colon). group instead of a user if its argument is prefixed by ':' (a colon).
This will cause the game score files in ${localstatedir}/games/emacs This will cause the game score files in ${localstatedir}/games/emacs
to be owned by that group, and the helper program for updating them to to be owned by that group, and the helper program for updating them to
be installed setgid. be installed setgid. The option now defaults to the 'games' group.
--- ---
** The `grep-changelog' script (and its manual page) are no longer included. ** The `grep-changelog' script (and its manual page) are no longer included.
......
2015-02-08 Ulrich Müller <ulm@gentoo.org>
* play/gamegrid.el: Update comment to reflect that the
'update-game-score' helper program is now setgid by default.
2015-02-08 David Kastrup <dak@gnu.org> 2015-02-08 David Kastrup <dak@gnu.org>
   
* subr.el (apply-partially): Use lexical binding here. * subr.el (apply-partially): Use lexical binding here.
......
...@@ -462,22 +462,22 @@ FILE is created there." ...@@ -462,22 +462,22 @@ FILE is created there."
;; `gamegrid-add-score' was supposed to be used in the past and ;; `gamegrid-add-score' was supposed to be used in the past and
;; is covered here for backward-compatibility. ;; is covered here for backward-compatibility.
;; ;;
;; 2. The helper program "update-game-score" is setuid and the ;; 2. The helper program "update-game-score" is setgid or setuid
;; file FILE does already exist in a system wide shared game ;; and the file FILE does already exist in a system wide shared
;; directory. This should be the normal case on POSIX systems, ;; game directory. This should be the normal case on POSIX
;; if the game was installed system wide. Use ;; systems, if the game was installed system wide. Use
;; "update-game-score" to add the score to the file in the ;; "update-game-score" to add the score to the file in the
;; shared game directory. ;; shared game directory.
;; ;;
;; 3. "update-game-score" is setuid, but the file FILE does *not* ;; 3. "update-game-score" is setgid/setuid, but the file FILE does
;; exist in the system wide shared game directory. Use ;; *not* exist in the system wide shared game directory. Use
;; `gamegrid-add-score-insecure' to create--if necessary--and ;; `gamegrid-add-score-insecure' to create--if necessary--and
;; update FILE. This is for the case that a user has installed ;; update FILE. This is for the case that a user has installed
;; a game on her own. ;; a game on her own.
;; ;;
;; 4. "update-game-score" is not setuid. Use it to create/update ;; 4. "update-game-score" is not setgid/setuid. Use it to
;; FILE in the user's home directory. There is presumably no ;; create/update FILE in the user's home directory. There is
;; shared game directory. ;; presumably no shared game directory.
(defvar gamegrid-shared-game-dir) (defvar gamegrid-shared-game-dir)
...@@ -491,7 +491,7 @@ FILE is created there." ...@@ -491,7 +491,7 @@ FILE is created there."
(gamegrid-add-score-insecure file score)) (gamegrid-add-score-insecure file score))
((and gamegrid-shared-game-dir ((and gamegrid-shared-game-dir
(file-exists-p (expand-file-name file shared-game-score-directory))) (file-exists-p (expand-file-name file shared-game-score-directory)))
;; Use the setuid (or setgid) "update-game-score" program ;; Use the setgid (or setuid) "update-game-score" program
;; to update a system-wide score file. ;; to update a system-wide score file.
(gamegrid-add-score-with-update-game-score-1 file (gamegrid-add-score-with-update-game-score-1 file
(expand-file-name file shared-game-score-directory) score)) (expand-file-name file shared-game-score-directory) score))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment