253c4e787a
Between Busybox 1.24.2 and 1.25.0 the bb_info_msg() function was eliminated and calls to it changed to be bb_error_msg(). The downside of this is that daemons now log all messages to syslog at the LOG_ERR level which makes it hard to filter errors from informational messages. This change optionally re-introduces bb_info_msg(), controlled by a new option FEATURE_SYSLOG_INFO, restores all the calls to bb_info_msg() that were removed (only in applets that set logmode to LOGMODE_SYSLOG or LOGMODE_BOTH), and also changes informational messages in ifplugd and ntpd. The code size change of this is as follows (using 'defconfig' on x86_64 with gcc 7.3.0-27ubuntu1~18.04) function old new delta bb_info_msg - 182 +182 bb_vinfo_msg - 27 +27 static.log7 194 198 +4 log8 190 191 +1 log5 190 191 +1 crondlog 45 - -45 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 3/0 up/down: 215/-45) Total: 170 bytes If you don't care about everything being logged at LOG_ERR level then when FEATURE_SYSLOG_INFO is disabled Busybox actually gets smaller: function old new delta static.log7 194 200 +6 log8 190 193 +3 log5 190 193 +3 syslog_level 1 - -1 bb_verror_msg 583 581 -2 crondlog 45 - -45 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 3/1 up/down: 12/-48) Total: -36 bytes Signed-off-by: James Byrne <james.byrne@origamienergy.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
94 lines
2.2 KiB
C
94 lines
2.2 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini sulogin implementation for busybox
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config SULOGIN
|
|
//config: bool "sulogin (17 kb)"
|
|
//config: default y
|
|
//config: select FEATURE_SYSLOG
|
|
//config: help
|
|
//config: sulogin is invoked when the system goes into single user
|
|
//config: mode (this is done through an entry in inittab).
|
|
|
|
//applet:IF_SULOGIN(APPLET_NOEXEC(sulogin, sulogin, BB_DIR_SBIN, BB_SUID_DROP, sulogin))
|
|
|
|
//kbuild:lib-$(CONFIG_SULOGIN) += sulogin.o
|
|
|
|
//usage:#define sulogin_trivial_usage
|
|
//usage: "[-t N] [TTY]"
|
|
//usage:#define sulogin_full_usage "\n\n"
|
|
//usage: "Single user login\n"
|
|
//usage: "\n -t N Timeout"
|
|
|
|
#include "libbb.h"
|
|
#include <syslog.h>
|
|
|
|
int sulogin_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int sulogin_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
int timeout = 0;
|
|
struct passwd *pwd;
|
|
const char *shell;
|
|
|
|
/* Note: sulogin is not a suid app. It is meant to be run by init
|
|
* for single user / emergency mode. init starts it as root.
|
|
* Normal users (potentially malicious ones) can only run it under
|
|
* their UID, therefore no paranoia here is warranted:
|
|
* $LD_LIBRARY_PATH in env, TTY = /dev/sda
|
|
* are no more dangerous here than in e.g. cp applet.
|
|
*/
|
|
|
|
logmode = LOGMODE_BOTH;
|
|
openlog(applet_name, 0, LOG_AUTH);
|
|
|
|
getopt32(argv, "t:+", &timeout);
|
|
argv += optind;
|
|
|
|
if (argv[0]) {
|
|
close(0);
|
|
close(1);
|
|
dup(xopen(argv[0], O_RDWR));
|
|
close(2);
|
|
dup(0);
|
|
}
|
|
|
|
pwd = getpwuid(0);
|
|
if (!pwd) {
|
|
bb_error_msg_and_die("no password entry for root");
|
|
}
|
|
|
|
while (1) {
|
|
int r;
|
|
|
|
r = ask_and_check_password_extended(pwd, timeout,
|
|
"Give root password for system maintenance\n"
|
|
"(or type Control-D for normal startup):"
|
|
);
|
|
if (r < 0) {
|
|
/* ^D, ^C, timeout, or read error */
|
|
bb_info_msg("normal startup");
|
|
return 0;
|
|
}
|
|
if (r > 0) {
|
|
break;
|
|
}
|
|
bb_do_delay(LOGIN_FAIL_DELAY);
|
|
bb_info_msg("Login incorrect");
|
|
}
|
|
|
|
bb_info_msg("starting shell for system maintenance");
|
|
|
|
IF_SELINUX(renew_current_security_context());
|
|
|
|
shell = getenv("SUSHELL");
|
|
if (!shell)
|
|
shell = getenv("sushell");
|
|
if (!shell)
|
|
shell = pwd->pw_shell;
|
|
|
|
/* Exec login shell with no additional parameters. Never returns. */
|
|
run_shell(shell, 1, NULL);
|
|
}
|