diff options
| author | Denys Vlasenko | 2011-06-22 04:17:49 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2011-06-22 04:17:49 +0200 |
| commit | d5ac9c88a7f620f6b775e404b145017827a10480 (patch) | |
| tree | 04e9e439cfae3e15c10810eb84478d8f22408d04 | |
| parent | 1e18a01fa2965ef967b99d519018e21c9b5f15af (diff) | |
| download | busybox-d5ac9c88a7f620f6b775e404b145017827a10480.zip busybox-d5ac9c88a7f620f6b775e404b145017827a10480.tar.gz | |
groups: make it NOEXEC
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/id.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/coreutils/id.c b/coreutils/id.c index 71acce4..bb950f9 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -30,8 +30,8 @@ //kbuild:lib-$(CONFIG_GROUPS) += id.o //kbuild:lib-$(CONFIG_ID) += id.o -//applet:IF_GROUPS(APPLET_ODDNAME(groups, id, BB_DIR_USR_BIN, BB_SUID_DROP, groups)) -//applet:IF_ID(APPLET_NOEXEC(id, id, BB_DIR_USR_BIN, BB_SUID_DROP, id)) +//applet:IF_GROUPS(APPLET_NOEXEC(groups, id, BB_DIR_USR_BIN, BB_SUID_DROP, groups)) +//applet:IF_ID( APPLET_NOEXEC(id, id, BB_DIR_USR_BIN, BB_SUID_DROP, id )) //usage:#define id_trivial_usage //usage: "[OPTIONS] [USER]" @@ -164,7 +164,13 @@ int id_main(int argc UNUSED_PARAM, char **argv) #endif if (ENABLE_GROUPS && (!ENABLE_ID || applet_name[0] == 'g')) { - option_mask32 = opt = getopt32(argv, "") | JUST_ALL_GROUPS | NAME_NOT_NUMBER; + /* TODO: coreutils groups prepend "USER : " prefix, + * and accept many usernames. Example: + * # groups root root + * root : root + * root : root + */ + opt = option_mask32 = getopt32(argv, "") | JUST_ALL_GROUPS | NAME_NOT_NUMBER; } else { /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/ /* Don't allow more than one username */ |