diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-08-26 23:13:00 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-08-26 23:13:00 +0000 |
commit | 138791050d36d221d718568094892245d7c6f6ec (patch) | |
tree | 24c9479dab9bc019f716093628a70e392b3c40cb | |
parent | 37ba6bfb6d7ff7287ecda14bb4906fa6de1e78c9 (diff) | |
download | busybox-w32-138791050d36d221d718568094892245d7c6f6ec.tar.gz busybox-w32-138791050d36d221d718568094892245d7c6f6ec.tar.bz2 busybox-w32-138791050d36d221d718568094892245d7c6f6ec.zip |
Improve the setuid situation a bit, and make it more apparent
when people really ought to make busybox setuid root.
-Erik
-rw-r--r-- | Makefile | 10 | ||||
-rw-r--r-- | loginutils/Config.in | 16 | ||||
-rw-r--r-- | miscutils/Config.in | 3 |
3 files changed, 29 insertions, 0 deletions
@@ -57,6 +57,16 @@ busybox.links: applets/busybox.mkll include/config.h | |||
57 | 57 | ||
58 | install: applets/install.sh busybox busybox.links | 58 | install: applets/install.sh busybox busybox.links |
59 | $(SHELL) $< $(PREFIX) | 59 | $(SHELL) $< $(PREFIX) |
60 | ifeq ($(strip $(CONFIG_FEATURE_SUID)),y) | ||
61 | @echo | ||
62 | @echo | ||
63 | @echo -------------------------------------------------- | ||
64 | @echo You will probably need to make your busybox binary | ||
65 | @echo setuid root to ensure all configured applets will | ||
66 | @echo work properly. | ||
67 | @echo -------------------------------------------------- | ||
68 | @echo | ||
69 | endif | ||
60 | 70 | ||
61 | uninstall: busybox.links | 71 | uninstall: busybox.links |
62 | rm -f $(PREFIX)/bin/busybox | 72 | rm -f $(PREFIX)/bin/busybox |
diff --git a/loginutils/Config.in b/loginutils/Config.in index d9938b066..5619aa9af 100644 --- a/loginutils/Config.in +++ b/loginutils/Config.in | |||
@@ -69,9 +69,13 @@ config CONFIG_FEATURE_U_W_TMP | |||
69 | config CONFIG_LOGIN | 69 | config CONFIG_LOGIN |
70 | bool "login" | 70 | bool "login" |
71 | default n | 71 | default n |
72 | select CONFIG_FEATURE_SUID | ||
72 | help | 73 | help |
73 | login is used when signing onto a system. | 74 | login is used when signing onto a system. |
74 | 75 | ||
76 | Note that Busybox binary must be setuid root for this applet to | ||
77 | work properly. | ||
78 | |||
75 | config CONFIG_FEATURE_SECURETTY | 79 | config CONFIG_FEATURE_SECURETTY |
76 | bool " Support for /etc/securetty" | 80 | bool " Support for /etc/securetty" |
77 | default y | 81 | default y |
@@ -84,19 +88,27 @@ config CONFIG_FEATURE_SECURETTY | |||
84 | config CONFIG_PASSWD | 88 | config CONFIG_PASSWD |
85 | bool "passwd" | 89 | bool "passwd" |
86 | default n | 90 | default n |
91 | select CONFIG_FEATURE_SUID | ||
87 | help | 92 | help |
88 | passwd changes passwords for user and group accounts. A normal user | 93 | passwd changes passwords for user and group accounts. A normal user |
89 | may only change the password for his/her own account, the super user | 94 | may only change the password for his/her own account, the super user |
90 | may change the password for any account. The administrator of a group | 95 | may change the password for any account. The administrator of a group |
91 | may change the password for the group. | 96 | may change the password for the group. |
92 | 97 | ||
98 | Note that Busybox binary must be setuid root for this applet to | ||
99 | work properly. | ||
100 | |||
93 | config CONFIG_SU | 101 | config CONFIG_SU |
94 | bool "su" | 102 | bool "su" |
95 | default n | 103 | default n |
104 | select CONFIG_FEATURE_SUID | ||
96 | help | 105 | help |
97 | su is used to become another user during a login session. | 106 | su is used to become another user during a login session. |
98 | Invoked without a username, su defaults to becoming the super user. | 107 | Invoked without a username, su defaults to becoming the super user. |
99 | 108 | ||
109 | Note that Busybox binary must be setuid root for this applet to | ||
110 | work properly. | ||
111 | |||
100 | config CONFIG_SULOGIN | 112 | config CONFIG_SULOGIN |
101 | bool "sulogin" | 113 | bool "sulogin" |
102 | default n | 114 | default n |
@@ -107,9 +119,13 @@ config CONFIG_SULOGIN | |||
107 | config CONFIG_VLOCK | 119 | config CONFIG_VLOCK |
108 | bool "vlock" | 120 | bool "vlock" |
109 | default n | 121 | default n |
122 | select CONFIG_FEATURE_SUID | ||
110 | help | 123 | help |
111 | Build the "vlock" applet which allows you to lock (virtual) terminals. | 124 | Build the "vlock" applet which allows you to lock (virtual) terminals. |
112 | 125 | ||
126 | Note that Busybox binary must be setuid root for this applet to | ||
127 | work properly. | ||
128 | |||
113 | comment "Common options for adduser, deluser, login, su" | 129 | comment "Common options for adduser, deluser, login, su" |
114 | depends on CONFIG_ADDUSER || CONFIG_DELUSER || CONFIG_LOGIN || CONFIG_SU | 130 | depends on CONFIG_ADDUSER || CONFIG_DELUSER || CONFIG_LOGIN || CONFIG_SU |
115 | 131 | ||
diff --git a/miscutils/Config.in b/miscutils/Config.in index 3c92c4674..77e13e84e 100644 --- a/miscutils/Config.in +++ b/miscutils/Config.in | |||
@@ -15,6 +15,7 @@ config CONFIG_ADJTIMEX | |||
15 | config CONFIG_CROND | 15 | config CONFIG_CROND |
16 | bool "crond" | 16 | bool "crond" |
17 | default n | 17 | default n |
18 | select CONFIG_FEATURE_SUID | ||
18 | help | 19 | help |
19 | Crond is a background daemon that parses individual crontab | 20 | Crond is a background daemon that parses individual crontab |
20 | files and executes commands on behalf of the users in question. | 21 | files and executes commands on behalf of the users in question. |
@@ -23,6 +24,8 @@ config CONFIG_CROND | |||
23 | $ cat /var/spool/cron/crontabs/root | 24 | $ cat /var/spool/cron/crontabs/root |
24 | # Run daily cron jobs at 4:40 every day: | 25 | # Run daily cron jobs at 4:40 every day: |
25 | 40 4 * * * /etc/cron/daily > /dev/null 2>&1 | 26 | 40 4 * * * /etc/cron/daily > /dev/null 2>&1 |
27 | Note that Busybox binary must be setuid root for this applet to | ||
28 | work properly. | ||
26 | 29 | ||
27 | config CONFIG_FEATURE_CROND_CALL_SENDMAIL | 30 | config CONFIG_FEATURE_CROND_CALL_SENDMAIL |
28 | bool " Using /usr/sbin/sendmail?" | 31 | bool " Using /usr/sbin/sendmail?" |