emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

login: style fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-08 17:22:45 +00:00
parent dd93abeaff
commit 2e502914b0
4 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libbb.h
View File

@ -490,9 +490,9 @@ void xprint_and_close_file(FILE *file);
#define FAIL_DELAY 3 #define FAIL_DELAY 3
extern void bb_do_delay(int seconds); extern void bb_do_delay(int seconds);
extern void change_identity ( const struct passwd *pw ); extern void change_identity(const struct passwd *pw);
extern const char *change_identity_e2str ( const struct passwd *pw ); extern const char *change_identity_e2str(const struct passwd *pw);
extern void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args); extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args);
#ifdef CONFIG_SELINUX #ifdef CONFIG_SELINUX
extern void renew_current_security_context(void); extern void renew_current_security_context(void);
extern void set_current_security_context(security_context_t sid); extern void set_current_security_context(security_context_t sid);

12
libbb/change_identity.c
View File

@ -40,21 +40,21 @@
/* Become the user and group(s) specified by PW. */ /* Become the user and group(s) specified by PW. */
const char *change_identity_e2str ( const struct passwd *pw ) const char *change_identity_e2str(const struct passwd *pw)
{ {
if ( initgroups ( pw-> pw_name, pw-> pw_gid ) == -1 ) if (initgroups(pw->pw_name, pw->pw_gid) == -1)
return "cannot set groups"; return "cannot set groups";
endgrent ( ); endgrent();
xsetgid(pw-> pw_gid); xsetgid(pw->pw_gid);
xsetuid(pw->pw_uid); xsetuid(pw->pw_uid);
return NULL; return NULL;
} }
void change_identity ( const struct passwd *pw ) void change_identity(const struct passwd *pw)
{ {
const char *err_msg = change_identity_e2str(pw); const char *err_msg = change_identity_e2str(pw);
if(err_msg) if(err_msg)
bb_perror_msg_and_die ( "%s", err_msg ); bb_perror_msg_and_die("%s", err_msg);
} }

8
loginutils/Config.in
View File

@ -111,6 +111,14 @@ config CONFIG_LOGIN
Note that Busybox binary must be setuid root for this applet to Note that Busybox binary must be setuid root for this applet to
work properly. work properly.
config CONFIG_LOGIN_SCRIPTS
bool "Support for login scripts"
depends on CONFIG_LOGIN
default n
help
Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
just prior to swithching from root to logged-in user.
config CONFIG_FEATURE_SECURETTY config CONFIG_FEATURE_SECURETTY
bool "Support for /etc/securetty" bool "Support for /etc/securetty"
default y default y

22
loginutils/login.c
View File

@ -15,6 +15,7 @@
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h> #include <ctype.h>
#include <time.h> #include <time.h>
@ -258,6 +259,27 @@ auth_ok:
chown ( full_tty, pw-> pw_uid, pw-> pw_gid ); chown ( full_tty, pw-> pw_uid, pw-> pw_gid );
chmod ( full_tty, 0600 ); chmod ( full_tty, 0600 );
if (ENABLE_LOGIN_SCRIPTS) {
char *script = getenv("LOGIN_PRE_SUID_SCRIPT");
if (script) {
char *t_argv[2] = { script, NULL };
switch(fork()) {
case -1: break;
case 0: /* child */
xchdir("/");
setenv("LOGIN_TTY", full_tty, 1);
setenv("LOGIN_USER", pw->pw_name, 1);
setenv("LOGIN_UID", utoa(pw->pw_uid), 1);
setenv("LOGIN_GID", utoa(pw->pw_gid), 1);
setenv("LOGIN_SHELL", pw->pw_shell, 1);
execvp(script, t_argv);
exit(1);
default: /* parent */
wait(NULL);
}
}
}
change_identity ( pw ); change_identity ( pw );
tmp = pw-> pw_shell; tmp = pw-> pw_shell;
if(!tmp || !*tmp) if(!tmp || !*tmp)