aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-12-26 17:37:38 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-12-26 17:37:38 +0000
commit3ef70d43adfa3eb0f74fefd72d05578b3e332b76 (patch)
treeda5995d46e8f5505cf0af5d3049087f7d7cf5d16 /loginutils
parentbf0a201008671f81c107de72c026b1b84967561d (diff)
downloadbusybox-w32-3ef70d43adfa3eb0f74fefd72d05578b3e332b76.tar.gz
busybox-w32-3ef70d43adfa3eb0f74fefd72d05578b3e332b76.tar.bz2
busybox-w32-3ef70d43adfa3eb0f74fefd72d05578b3e332b76.zip
adduser: trivial code movement
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/adduser.c12
1 files changed, 6 insertions, 6 deletions
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)
164 const char *usegroup = NULL; 164 const char *usegroup = NULL;
165 unsigned long flags; 165 unsigned long flags;
166 166
167 /* got root? */
168 if (geteuid()) {
169 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
170 }
171
167 pw.pw_gecos = "Linux User,,,"; 172 pw.pw_gecos = "Linux User,,,";
168 pw.pw_shell = (char *)DEFAULT_SHELL; 173 pw.pw_shell = (char *)DEFAULT_SHELL;
169 pw.pw_dir = NULL; 174 pw.pw_dir = NULL;
@@ -172,15 +177,10 @@ int adduser_main(int argc, char **argv)
172 opt_complementary = "-1:?1:?"; 177 opt_complementary = "-1:?1:?";
173 flags = getopt32(argc, argv, "h:g:s:G:DSH", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup); 178 flags = getopt32(argc, argv, "h:g:s:G:DSH", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup);
174 179
175 /* got root? */
176 if(geteuid()) {
177 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
178 }
179
180 /* create string for $HOME if not specified already */ 180 /* create string for $HOME if not specified already */
181 if (!pw.pw_dir) { 181 if (!pw.pw_dir) {
182 snprintf(bb_common_bufsiz1, BUFSIZ, "/home/%s", argv[optind]); 182 snprintf(bb_common_bufsiz1, BUFSIZ, "/home/%s", argv[optind]);
183 pw.pw_dir = &bb_common_bufsiz1[0]; 183 pw.pw_dir = bb_common_bufsiz1;
184 } 184 }
185 185
186 /* create a passwd struct */ 186 /* create a passwd struct */