Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-11 10:23:41 +00:00
Code Issues Projects Releases Wiki Activity

- r16075 broke for de-selected FEATURE_UTMP; Partial fix that wants some more cleanup (see FIXME in the patch).

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2006-09-13 15:42:47 +00:00
parent 577905f1e4
commit 92582f2e11
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
loginutils/login.c
View File

@ -3,23 +3,11 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include <fcntl.h> #include "busybox.h"
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#include <termios.h>
#include <unistd.h>
#include <utmp.h> #include <utmp.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/stat.h> #include <syslog.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h>
#include <time.h>
#include "busybox.h"
#ifdef CONFIG_SELINUX #ifdef CONFIG_SELINUX
#include <selinux/selinux.h> /* for is_selinux_enabled() */ #include <selinux/selinux.h> /* for is_selinux_enabled() */
#include <selinux/get_context_list.h> /* for get_default_context() */ #include <selinux/get_context_list.h> /* for get_default_context() */
@ -27,12 +15,12 @@
#include <errno.h> #include <errno.h>
#endif #endif
#ifdef CONFIG_FEATURE_UTMP /* import from utmp.c
// import from utmp.c * XXX: FIXME: provide empty bodies if ENABLE_FEATURE_UTMP == 0
*/
static struct utmp utent; static struct utmp utent;
static void read_or_build_utent(int picky); static void read_or_build_utent(int);
static void write_utent(const char *username); static void write_utent(const char *);
#endif
enum { enum {
TIMEOUT = 60, TIMEOUT = 60,
@ -43,12 +31,10 @@ enum {
static void die_if_nologin_and_non_root(int amroot); static void die_if_nologin_and_non_root(int amroot);
#if defined CONFIG_FEATURE_SECURETTY #if ENABLE_FEATURE_SECURETTY
static int check_securetty(void); static int check_securetty(void);
#else #else
static inline int check_securetty(void) { return 1; } static inline int check_securetty(void) { return 1; }
#endif #endif
static void get_username_or_die(char *buf, int size_buf); static void get_username_or_die(char *buf, int size_buf);
@ -84,9 +70,6 @@ int login_main(int argc, char **argv)
int flag; int flag;
int count = 0; int count = 0;
struct passwd *pw; struct passwd *pw;
#ifdef CONFIG_WHEEL_GROUP
struct group *grp;
#endif
int opt_preserve = 0; int opt_preserve = 0;
int opt_fflag = 0; int opt_fflag = 0;
char *opt_host = 0; char *opt_host = 0;
@ -321,7 +304,7 @@ static void die_if_nologin_and_non_root(int amroot)
puts("\r\n[Disconnect bypassed -- root login allowed.]\r"); puts("\r\n[Disconnect bypassed -- root login allowed.]\r");
} }
#ifdef CONFIG_FEATURE_SECURETTY #if ENABLE_FEATURE_SECURETTY
static int check_securetty(void) static int check_securetty(void)
{ {
@ -367,7 +350,7 @@ static void motd(void)
} }
#ifdef CONFIG_FEATURE_UTMP #if ENABLE_FEATURE_UTMP
/* vv Taken from tinylogin utmp.c vv */ /* vv Taken from tinylogin utmp.c vv */
/* /*
@ -432,7 +415,7 @@ static void write_utent(const char *username)
setutent(); setutent();
pututline(&utent); pututline(&utent);
endutent(); endutent();
#ifdef CONFIG_FEATURE_WTMP #if ENABLE_FEATURE_WTMP
if (access(bb_path_wtmp_file, R_OK|W_OK) == -1) { if (access(bb_path_wtmp_file, R_OK|W_OK) == -1) {
close(creat(bb_path_wtmp_file, 0664)); close(creat(bb_path_wtmp_file, 0664));
} }