diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-26 17:37:38 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-26 17:37:38 +0000 |
| commit | 3ef70d43adfa3eb0f74fefd72d05578b3e332b76 (patch) | |
| tree | da5995d46e8f5505cf0af5d3049087f7d7cf5d16 | |
| parent | bf0a201008671f81c107de72c026b1b84967561d (diff) | |
| download | busybox-3ef70d43adfa3eb0f74fefd72d05578b3e332b76.tar.gz | |
adduser: trivial code movement
| -rw-r--r-- | Config.in | 2 | ||||
| -rw-r--r-- | examples/udhcp/udhcpd.conf | 2 | ||||
| -rw-r--r-- | loginutils/adduser.c | 12 |
3 files changed, 8 insertions, 8 deletions
@@ -441,7 +441,7 @@ config INSTALL_APPLET_DONT prompt "not installed" depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE_SHELL help - Do not install applets links. Usefull when using the -install feature + Do not install applet links. Useful when using the -install feature or a standalone shell for rescue pruposes. endchoice diff --git a/examples/udhcp/udhcpd.conf b/examples/udhcp/udhcpd.conf index f91fddebf..34e47f788 100644 --- a/examples/udhcp/udhcpd.conf +++ b/examples/udhcp/udhcpd.conf @@ -67,7 +67,7 @@ interface eth0 #default: eth0 #notify_file #default: (no script) -#notify_file dumpleases # <--- usefull for debugging +#notify_file dumpleases # <--- useful for debugging # The following are bootp specific options, setable by udhcpd. diff --git a/loginutils/adduser.c b/loginutils/adduser.c index 44516ef5a..418d4c785 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c @@ -164,6 +164,11 @@ int adduser_main(int argc, char **argv) const char *usegroup = NULL; unsigned long flags; + /* got root? */ + if (geteuid()) { + bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); + } + pw.pw_gecos = "Linux User,,,"; pw.pw_shell = (char *)DEFAULT_SHELL; pw.pw_dir = NULL; @@ -172,15 +177,10 @@ int adduser_main(int argc, char **argv) opt_complementary = "-1:?1:?"; flags = getopt32(argc, argv, "h:g:s:G:DSH", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup); - /* got root? */ - if(geteuid()) { - bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); - } - /* create string for $HOME if not specified already */ if (!pw.pw_dir) { snprintf(bb_common_bufsiz1, BUFSIZ, "/home/%s", argv[optind]); - pw.pw_dir = &bb_common_bufsiz1[0]; + pw.pw_dir = bb_common_bufsiz1; } /* create a passwd struct */ |