summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system.scm28
1 files changed, 1 insertions, 27 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index c76f4d7c502..5c18edd620b 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -302,8 +302,7 @@ VERSION is the target version of the boot-parameters record."
302 (pam-services operating-system-pam-services ; list of PAM services 302 (pam-services operating-system-pam-services ; list of PAM services
303 (default (base-pam-services))) 303 (default (base-pam-services)))
304 (setuid-programs operating-system-setuid-programs 304 (setuid-programs operating-system-setuid-programs
305 (default %setuid-programs) ; list of <setuid-program> 305 (default %setuid-programs)) ; list of <setuid-program>
306 (sanitize ensure-setuid-program-list))
307 306
308 (sudoers-file operating-system-sudoers-file ; file-like 307 (sudoers-file operating-system-sudoers-file ; file-like
309 (default %sudoers-specification)) 308 (default %sudoers-specification))
@@ -1240,31 +1239,6 @@ use 'plain-file' instead~%")
1240 ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal. 1239 ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal.
1241 ("DBUS_FATAL_WARNINGS" . "0"))) 1240 ("DBUS_FATAL_WARNINGS" . "0")))
1242 1241
1243;; Ensure LST is a list of <setuid-program> records and warn otherwise.
1244(define-with-syntax-properties (ensure-setuid-program-list (lst properties))
1245 (%ensure-setuid-program-list lst properties))
1246
1247;; We want to be able to use defines, so define a procedure.
1248(define (%ensure-setuid-program-list lst properties)
1249 (define warned? #f)
1250
1251 (define (warn-once)
1252 (unless warned?
1253 (warning (source-properties->location properties)
1254 (G_ "representing setuid programs with file-like objects is \
1255deprecated; use 'setuid-program' instead~%"))
1256 (set! warned? #t)))
1257
1258 (map (match-lambda
1259 ((? setuid-program? program)
1260 program)
1261 (program
1262 ;; PROGRAM is a file-like or a gexp like #~(string-append #$foo
1263 ;; "/bin/bar").
1264 (warn-once)
1265 (setuid-program (program program))))
1266 lst))
1267
1268(define %setuid-programs 1242(define %setuid-programs
1269 ;; Default set of setuid-root programs. 1243 ;; Default set of setuid-root programs.
1270 (let ((shadow (@ (gnu packages admin) shadow))) 1244 (let ((shadow (@ (gnu packages admin) shadow)))