aboutsummaryrefslogtreecommitdiff
path: root/loginutils/login.c
diff options
context:
space:
mode:
authorbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-09-02 02:36:18 +0000
committerbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-09-02 02:36:18 +0000
commitd7cb97b8bf8945b6f04bcccbb9be72d638158321 (patch)
treed2ff4fef7b9192de63761935103699569ecbb2ee /loginutils/login.c
parent253ff43f62644ee79597eed14b49dcf291f198a1 (diff)
downloadbusybox-w32-d7cb97b8bf8945b6f04bcccbb9be72d638158321.tar.gz
busybox-w32-d7cb97b8bf8945b6f04bcccbb9be72d638158321.tar.bz2
busybox-w32-d7cb97b8bf8945b6f04bcccbb9be72d638158321.zip
move all "-/bin/sh" "/bin/sh" and "sh" to libbb/messages.c file as one
constant. Vodz last_patch_107 git-svn-id: svn://busybox.net/trunk/busybox@7365 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'loginutils/login.c')
-rw-r--r--loginutils/login.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/loginutils/login.c b/loginutils/login.c
index c2bada258..3fca899c0 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -65,7 +65,7 @@ extern int login_main(int argc, char **argv)
65 char full_tty[200]; 65 char full_tty[200];
66 char fromhost[512]; 66 char fromhost[512];
67 char username[USERNAME_SIZE]; 67 char username[USERNAME_SIZE];
68 char *tmp; 68 const char *tmp;
69 int amroot; 69 int amroot;
70 int flag; 70 int flag;
71 int failed; 71 int failed;
@@ -267,15 +267,17 @@ auth_ok:
267 chmod ( full_tty, 0600 ); 267 chmod ( full_tty, 0600 );
268 268
269 change_identity ( pw ); 269 change_identity ( pw );
270 setup_environment ( pw-> pw_shell, 1, !opt_preserve, pw ); 270 tmp = pw-> pw_shell;
271 if(!tmp || !*tmp)
272 tmp = DEFAULT_SHELL;
273 setup_environment ( tmp, 1, !opt_preserve, pw );
271 274
272 motd ( ); 275 motd ( );
273 signal ( SIGALRM, SIG_DFL ); /* default alarm signal */ 276 signal ( SIGALRM, SIG_DFL ); /* default alarm signal */
274 277
275 if ( pw-> pw_uid == 0 ) 278 if ( pw-> pw_uid == 0 )
276 syslog ( LOG_INFO, "root login %s\n", fromhost ); 279 syslog ( LOG_INFO, "root login %s\n", fromhost );
277 280 run_shell ( tmp, 1, 0, 0
278 run_shell ( pw-> pw_shell, 1, 0, 0
279#ifdef CONFIG_SELINUX 281#ifdef CONFIG_SELINUX
280 , sid 282 , sid
281#endif 283#endif