From 8bb05ac73a5b448b339ce0bc8d396c82c459b47f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 21:33:32 +0200 Subject: Merging upstream version 2.40. Signed-off-by: Daniel Baumann --- sys-utils/ctrlaltdel.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'sys-utils/ctrlaltdel.c') diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c index 303d2dc..1601154 100644 --- a/sys-utils/ctrlaltdel.c +++ b/sys-utils/ctrlaltdel.c @@ -1,10 +1,16 @@ /* - * ctrlaltdel.c - Set the function of the Ctrl-Alt-Del combination - * Created 4-Jul-92 by Peter Orbaek - * 1999-02-22 Arkadiusz Miśkiewicz - * - added Native Language Support + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Copyright (C) 1992 Peter Orbaek + * Copyright (C) 1992-1993 Rickard E. Faith + * + * Set the function of the Ctrl-Alt-Del combination */ - #include #include #include @@ -31,8 +37,8 @@ static void __attribute__((__noreturn__)) usage(void) fprintf(out, _("Set the function of the Ctrl-Alt-Del combination.\n")); fputs(USAGE_OPTIONS, out); - printf(USAGE_HELP_OPTIONS(16)); - printf(USAGE_MAN_TAIL("ctrlaltdel(8)")); + fprintf(out, USAGE_HELP_OPTIONS(16)); + fprintf(out, USAGE_MAN_TAIL("ctrlaltdel(8)")); exit(EXIT_SUCCESS); } @@ -62,10 +68,6 @@ static int set_cad(const char *arg) { unsigned int cmd; - if (geteuid()) { - warnx(_("You must be root to set the Ctrl-Alt-Del behavior")); - return EXIT_FAILURE; - } if (!strcmp("hard", arg)) cmd = LINUX_REBOOT_CMD_CAD_ON; else if (!strcmp("soft", arg)) -- cgit v1.2.3