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

last_patch95 from vodz:

Browse Source 
Hi.

Last patch have new libbb function
vfork_rexec() for can use daemon() to uClinux system.
This patched daemons: syslog, klogd, inetd, crond.
This not tested! I havn`t this systems.
Also. Previous patch for feature request MD5 crypt password for
httpd don`t sended to this mailist on 07/15/03
(mailist have Pytom module problem?).
The previous patch included, and have testing.


--w
vodz
This commit is contained in:
Eric Andersen 2003-07-28 07:40:39 +00:00
parent 4f4631732c
commit 35e643b39f
11 changed files with 336 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -453,4 +453,6 @@ extern llist_t *llist_add_to(llist_t *old_head, char *new_item);
void print_login_issue(const char *issue_file, const char *tty); void print_login_issue(const char *issue_file, const char *tty);
void print_login_prompt(void); void print_login_prompt(void);
void vfork_daemon_rexec(int argc, char **argv, char *foreground_opt);
#endif /* __LIBCONFIG_H__ */ #endif /* __LIBCONFIG_H__ */

2
libbb/Makefile.in
View File

@ -48,7 +48,7 @@ LIBBB_SRC:= \
fclose_nonstdin.c fflush_stdout_and_exit.c getopt_ulflags.c \ fclose_nonstdin.c fflush_stdout_and_exit.c getopt_ulflags.c \
default_error_retval.c wfopen_input.c speed_table.c \ default_error_retval.c wfopen_input.c speed_table.c \
perror_nomsg_and_die.c perror_nomsg.c skip_whitespace.c \ perror_nomsg_and_die.c perror_nomsg.c skip_whitespace.c \
warn_ignoring_args.c concat_subpath_file.c warn_ignoring_args.c concat_subpath_file.c vfork_daemon_rexec.c
LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC)) LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC))

27
libbb/vfork_daemon_rexec.c Normal file
View File

@ -0,0 +1,27 @@
/*
* Rexec program for system have fork() as vfork() with foregound option
* Copyright (C) Vladminr Oleynik and many different people.
*/
#include <unistd.h>
#include "libbb.h"
#if defined(__uClinux__)
void vfork_daemon_rexec(int argc, char **argv, char *foreground_opt)
{
char **vfork_args;
int a = 0;
vfork_args = xcalloc(sizeof(char *), argc + 3);
while(*argv) {
vfork_args[a++] = *argv;
argv++;
}
vfork_args[a] = foreground_opt;
execvp("/proc/self/exe", vfork_args);
vfork_args[0] = "/bin/busybox";
execv(vfork_args[0], vfork_args);
bb_perror_msg_and_die("execv %s", vfork_args[0]);
}
#endif /* uClinux */

7
miscutils/Config.in
View File

@ -19,6 +19,13 @@ config CONFIG_CROND
Crond is a background daemon that parses individual crontab Crond is a background daemon that parses individual crontab
files and executes commands on behalf of the users in question. files and executes commands on behalf of the users in question.
config CONFIG_FEATURE_CROND_CALL_SENDMAIL
bool " Using /usr/sbin/sendmail?"
default n
depends on CONFIG_CROND
help
Support call /usr/sbin/sendmail for send cmd outputs.
config CONFIG_CRONTAB config CONFIG_CRONTAB
bool "crontab" bool "crontab"
default n default n

451
miscutils/crond.c
View File

@ -41,14 +41,11 @@
#ifndef TMPDIR #ifndef TMPDIR
#define TMPDIR "/var/spool/cron" #define TMPDIR "/var/spool/cron"
#endif #endif
#ifndef LOG_FILE
#define LOG_FILE "/var/log/cron"
#endif
#ifndef SENDMAIL #ifndef SENDMAIL
#define SENDMAIL "/usr/sbin/sendmail" #define SENDMAIL "/usr/sbin/sendmail"
#endif #endif
#ifndef SENDMAIL_ARGS #ifndef SENDMAIL_ARGS
#define SENDMAIL_ARGS "-t", "-oem", "-i" #define SENDMAIL_ARGS "-ti", "oem"
#endif #endif
#ifndef CRONUPDATE #ifndef CRONUPDATE
#define CRONUPDATE "cron.update" #define CRONUPDATE "cron.update"
@ -57,6 +54,7 @@
#define MAXLINES 256 /* max lines in non-root crontabs */ #define MAXLINES 256 /* max lines in non-root crontabs */
#endif #endif
static const char def_sh[] = "/bin/sh";
typedef struct CronFile { typedef struct CronFile {
@ -71,7 +69,7 @@ typedef struct CronFile {
typedef struct CronLine { typedef struct CronLine {
struct CronLine *cl_Next; struct CronLine *cl_Next;
char *cl_Shell; /* shell command */ char *cl_Shell; /* shell command */
int cl_Pid; /* running pid, 0, or armed (-1) */ pid_t cl_Pid; /* running pid, 0, or armed (-1) */
int cl_MailFlag; /* running pid is for mail */ int cl_MailFlag; /* running pid is for mail */
int cl_MailPos; /* 'empty file' size */ int cl_MailPos; /* 'empty file' size */
char cl_Mins[60]; /* 0-59 */ char cl_Mins[60]; /* 0-59 */
@ -92,13 +90,9 @@ static short DebugOpt;
#endif #endif
static short LogLevel = 8; static short LogLevel = 8;
static short ForegroundOpt; static const char *LogFile;
static short LoggerOpt;
static const char *LogFile = LOG_FILE;
static const char *CDir = CRONTABS; static const char *CDir = CRONTABS;
static void log(int level, const char *ctl, ...);
static void log9(const char *ctl, ...);
static void startlogger(void); static void startlogger(void);
static void CheckUpdates(void); static void CheckUpdates(void);
@ -106,14 +100,54 @@ static void SynchronizeDir(void);
static int TestJobs(time_t t1, time_t t2); static int TestJobs(time_t t1, time_t t2);
static void RunJobs(void); static void RunJobs(void);
static int CheckJobs(void); static int CheckJobs(void);
static void RunJob(CronFile *file, CronLine *line);
static void EndJob(const CronFile *file, CronLine *line); static void RunJob(const char *user, CronLine *line);
#ifdef CONFIG_FEATURE_CROND_CALL_SENDMAIL
static void EndJob(const char *user, CronLine *line);
#else
#define EndJob(user, line) line->cl_Pid = 0
#endif
static void DeleteFile(const char *userName); static void DeleteFile(const char *userName);
static CronFile *FileBase; static CronFile *FileBase;
static void
log(const char *ctl, ...)
{
va_list va;
int level = (int)(ctl[0] & 0xf);
int type = level == 20 ?
LOG_ERR : ((ctl[0] & 0100) ? LOG_WARNING : LOG_NOTICE);
va_start(va, ctl);
if (level >= LogLevel) {
#ifdef FEATURE_DEBUG_OPT
if (DebugOpt) vfprintf(stderr, ctl, va);
else
#endif
if (LogFile == 0) vsyslog(type, ctl, va);
else {
int logfd;
if ((logfd = open(LogFile, O_WRONLY|O_CREAT|O_APPEND, 600)) >= 0) {
vdprintf(logfd, ctl, va);
close(logfd);
#ifdef FEATURE_DEBUG_OPT
} else {
bb_perror_msg("Can't open log file");
#endif
}
}
}
va_end(va);
if(ctl[0] & 0200)
exit(20);
}
int int
crond_main(int ac, char **av) crond_main(int ac, char **av)
{ {
@ -138,10 +172,8 @@ crond_main(int ac, char **av)
); );
if(opt & 1) if(opt & 1)
LogLevel = atoi(lopt); LogLevel = atoi(lopt);
LoggerOpt = opt & 2; if(opt & 2)
if(LoggerOpt)
if (*Lopt != 0) LogFile = Lopt; if (*Lopt != 0) LogFile = Lopt;
ForegroundOpt = opt & 4;
if(opt & 32) { if(opt & 32) {
if (*copt != 0) CDir = copt; if (*copt != 0) CDir = copt;
} }
@ -157,7 +189,7 @@ crond_main(int ac, char **av)
*/ */
if (chdir(CDir) != 0) if (chdir(CDir) != 0)
bb_perror_msg_and_die("chdir"); bb_perror_msg_and_die("%s", CDir);
signal(SIGHUP,SIG_IGN); /* hmm.. but, if kill -HUP original signal(SIGHUP,SIG_IGN); /* hmm.. but, if kill -HUP original
* version - his died. ;( * version - his died. ;(
@ -168,9 +200,15 @@ crond_main(int ac, char **av)
* optional detach from controlling terminal * optional detach from controlling terminal
*/ */
if (ForegroundOpt == 0) { if (!(opt & 4)) {
if(daemon(1, 0) < 0) if(daemon(1, 0) < 0) {
bb_perror_msg_and_die("daemon"); bb_perror_msg_and_die("daemon");
#if defined(__uClinux__)
} else {
/* reexec for vfork() do continue parent */
vfork_daemon_rexec(ac, av, "-f");
}
#endif /* uClinux */
} }
(void)startlogger(); /* need if syslog mode selected */ (void)startlogger(); /* need if syslog mode selected */
@ -180,7 +218,8 @@ crond_main(int ac, char **av)
* of 1 second. * of 1 second.
*/ */
log(9,"%s " VERSION " dillon, started, log level %d\n", av[0], LogLevel); log("\011%s " VERSION " dillon, started, log level %d\n", bb_applet_name,
LogLevel);
SynchronizeDir(); SynchronizeDir();
@ -221,11 +260,11 @@ crond_main(int ac, char **av)
CheckUpdates(); CheckUpdates();
#ifdef FEATURE_DEBUG_OPT #ifdef FEATURE_DEBUG_OPT
if (DebugOpt) if (DebugOpt)
log(5, "Wakeup dt=%d\n", dt); log("\005Wakeup dt=%d\n", dt);
#endif #endif
if (dt < -60*60 || dt > 60*60) { if (dt < -60*60 || dt > 60*60) {
t1 = t2; t1 = t2;
log9("time disparity of %d minutes detected\n", dt / 60); log("\111time disparity of %d minutes detected\n", dt / 60);
} else if (dt > 0) { } else if (dt > 0) {
TestJobs(t1, t2); TestJobs(t1, t2);
RunJobs(); RunJobs();
@ -242,81 +281,10 @@ crond_main(int ac, char **av)
} }
static void #if defined(FEATURE_DEBUG_OPT) || defined(CONFIG_FEATURE_CROND_CALL_SENDMAIL)
vlog(int level, int MLOG_LEVEL, const char *ctl, va_list va)
{
char buf[1024];
int logfd;
if (level >= LogLevel) {
vsnprintf(buf,sizeof(buf), ctl, va);
#ifdef FEATURE_DEBUG_OPT
if (DebugOpt) fprintf(stderr,"%s",buf);
else
#endif
if (LoggerOpt == 0) syslog(MLOG_LEVEL, "%s", buf);
else {
if ((logfd = open(LogFile,O_WRONLY|O_CREAT|O_APPEND,600)) >= 0){
write(logfd, buf, strlen(buf));
close(logfd);
} else
#ifdef FEATURE_DEBUG_OPT
bb_perror_msg("Can't open log file")
#endif
;
}
}
}
/* /*
set log_level=9 and log messages write to temp file..
*/ */
static void
log9(const char *ctl, ...)
{
va_list va;
va_start(va, ctl);
vlog(9, LOG_WARNING, ctl, va);
va_end(va);
}
/*
normal logger call point.
*/
static void
log(int level, const char *ctl, ...)
{
va_list va;
va_start(va, ctl);
vlog(level, LOG_NOTICE, ctl, va);
va_end(va);
}
/*
Original: void
logfd(int fd, const char *ctl, ...)
Updated to: log_error (used by jobs.c)
*/
static void
log_err(const char *ctl, ...)
{
va_list va;
va_start(va, ctl);
vlog(20, LOG_ERR, ctl, va);
va_end(va);
}
/*
used by jobs.c (write to temp file..)
*/
static void static void
fdprintf(int fd, const char *ctl, ...) fdprintf(int fd, const char *ctl, ...)
{ {
@ -326,10 +294,11 @@ fdprintf(int fd, const char *ctl, ...)
vdprintf(fd, ctl, va); vdprintf(fd, ctl, va);
va_end(va); va_end(va);
} }
#endif
static int static int
ChangeUser(const char *user, short dochdir) ChangeUser(const char *user)
{ {
struct passwd *pas; struct passwd *pas;
@ -338,58 +307,55 @@ ChangeUser(const char *user, short dochdir)
*/ */
if ((pas = getpwnam(user)) == 0) { if ((pas = getpwnam(user)) == 0) {
log(9, "failed to get uid for %s", user); log("\011failed to get uid for %s", user);
return(-1); return(-1);
} }
setenv("USER", pas->pw_name, 1); setenv("USER", pas->pw_name, 1);
setenv("HOME", pas->pw_dir, 1); setenv("HOME", pas->pw_dir, 1);
setenv("SHELL", "/bin/sh", 1); setenv("SHELL", def_sh, 1);
/* /*
* Change running state to the user in question * Change running state to the user in question
*/ */
if (initgroups(user, pas->pw_gid) < 0) { if (initgroups(user, pas->pw_gid) < 0) {
log(9, "initgroups failed: %s %m", user); log("\011initgroups failed: %s %m", user);
return(-1); return(-1);
} }
if (setregid(pas->pw_gid, pas->pw_gid) < 0) { /* drop all priviledges */
log(9, "setregid failed: %s %d", user, pas->pw_gid); if (setgid(pas->pw_gid) < 0) {
log("\011setgid failed: %s %d", user, pas->pw_gid);
return(-1); return(-1);
} }
if (setreuid(pas->pw_uid, pas->pw_uid) < 0) { if (setuid(pas->pw_uid) < 0) {
log(9, "setreuid failed: %s %d", user, pas->pw_uid); log("\011setuid failed: %s %d", user, pas->pw_uid);
return(-1); return(-1);
} }
if (dochdir) {
if (chdir(pas->pw_dir) < 0) { if (chdir(pas->pw_dir) < 0) {
log(8, "chdir failed: %s %s", user, pas->pw_dir); log("\011chdir failed: %s: %m", pas->pw_dir);
if (chdir(TMPDIR) < 0) { if (chdir(TMPDIR) < 0) {
log(9, "chdir failed: %s %s", TMPDIR, user); log("\011chdir failed: %s: %m", TMPDIR);
return(-1); return(-1);
} }
} }
}
return(pas->pw_uid); return(pas->pw_uid);
} }
static void static void
startlogger(void) startlogger(void)
{ {
if (LogFile == 0)
openlog(bb_applet_name, LOG_CONS|LOG_PID, LOG_CRON);
#ifdef FEATURE_DEBUG_OPT
else { /* test logfile */
int logfd; int logfd;
if (LoggerOpt == 0) if ((logfd = open(LogFile, O_WRONLY|O_CREAT|O_APPEND, 600)) >= 0)
openlog(bb_applet_name, LOG_CONS|LOG_PID,LOG_CRON);
else { /* test logfile */
if ((logfd = open(LogFile,O_WRONLY|O_CREAT|O_APPEND,600)) >= 0)
close(logfd); close(logfd);
else else
#ifdef FEATURE_DEBUG_OPT bb_perror_msg("Failed to open log file '%s' reason", LogFile);
printf("Failed to open log file '%s' reason: %m", LogFile)
#endif
;
} }
#endif
} }
@ -493,7 +459,7 @@ ParseField(char *user, char *ary, int modvalue, int off,
*/ */
if (skip == 0) { if (skip == 0) {
log9("failed user %s parsing %s\n", user, base); log("\111failed user %s parsing %s\n", user, base);
return(NULL); return(NULL);
} }
if (*ptr == '-' && n2 < 0) { if (*ptr == '-' && n2 < 0) {
@ -532,7 +498,7 @@ ParseField(char *user, char *ary, int modvalue, int off,
} while (n1 != n2 && --failsafe); } while (n1 != n2 && --failsafe);
if (failsafe == 0) { if (failsafe == 0) {
log9("failed user %s parsing %s\n", user, base); log("\111failed user %s parsing %s\n", user, base);
return(NULL); return(NULL);
} }
} }
@ -544,7 +510,7 @@ ParseField(char *user, char *ary, int modvalue, int off,
} }
if (*ptr != ' ' && *ptr != '\t' && *ptr != '\n') { if (*ptr != ' ' && *ptr != '\t' && *ptr != '\n') {
log9("failed user %s parsing %s\n", user, base); log("\111failed user %s parsing %s\n", user, base);
return(NULL); return(NULL);
} }
@ -556,8 +522,8 @@ ParseField(char *user, char *ary, int modvalue, int off,
int i; int i;
for (i = 0; i < modvalue; ++i) for (i = 0; i < modvalue; ++i)
log(5, "%d", ary[i]); log("\005%d", ary[i]);
log(5, "\n"); log("\005\n");
} }
#endif #endif
@ -636,7 +602,7 @@ SynchronizeFile(const char *fileName)
#ifdef FEATURE_DEBUG_OPT #ifdef FEATURE_DEBUG_OPT
if (DebugOpt) if (DebugOpt)
log9("User %s Entry %s\n", fileName, buf); log("\111User %s Entry %s\n", fileName, buf);
#endif #endif
/* /*
@ -674,7 +640,7 @@ SynchronizeFile(const char *fileName)
#ifdef FEATURE_DEBUG_OPT #ifdef FEATURE_DEBUG_OPT
if (DebugOpt) { if (DebugOpt) {
log9(" Command %s\n", ptr); log("\111 Command %s\n", ptr);
} }
#endif #endif
@ -686,7 +652,7 @@ SynchronizeFile(const char *fileName)
FileBase = file; FileBase = file;
if (maxLines == 0 || maxEntries == 0) if (maxLines == 0 || maxEntries == 0)
log9("Maximum number of lines reached for user %s\n", fileName); log("\111Maximum number of lines reached for user %s\n", fileName);
} }
fclose(fi); fclose(fi);
} }
@ -712,21 +678,17 @@ static void
SynchronizeDir(void) SynchronizeDir(void)
{ {
/* /*
* Attempt to delete the database. Note that we have to make a copy * Attempt to delete the database.
* of the string
*/ */
for (;;) { for (;;) {
CronFile *file; CronFile *file;
char *user;
for (file = FileBase; file && file->cf_Deleted; file = file->cf_Next) for (file = FileBase; file && file->cf_Deleted; file = file->cf_Next)
; ;
if (file == NULL) if (file == NULL)
break; break;
user = strdup(file->cf_User); DeleteFile(file->cf_User);
DeleteFile(user);
free(user);
} }
/* /*
@ -740,8 +702,7 @@ SynchronizeDir(void)
remove(CRONUPDATE); remove(CRONUPDATE);
if (chdir(CDir) < 0) { if (chdir(CDir) < 0) {
log9("unable to find %s\n", CDir); log("\311unable to find %s\n", CDir);
exit(20);
} }
{ {
DIR *dir; DIR *dir;
@ -754,12 +715,11 @@ SynchronizeDir(void)
if (getpwnam(den->d_name)) if (getpwnam(den->d_name))
SynchronizeFile(den->d_name); SynchronizeFile(den->d_name);
else else
log(7, "ignoring %s\n", den->d_name); log("\007ignoring %s\n", den->d_name);
} }
closedir(dir); closedir(dir);
} else { } else {
log9("Unable to open current dir!\n"); log("\311Unable to open current dir!\n");
exit(20);
} }
} }
} }
@ -836,14 +796,14 @@ TestJobs(time_t t1, time_t t2)
for (file = FileBase; file; file = file->cf_Next) { for (file = FileBase; file; file = file->cf_Next) {
#ifdef FEATURE_DEBUG_OPT #ifdef FEATURE_DEBUG_OPT
if (DebugOpt) if (DebugOpt)
log(5, "FILE %s:\n", file->cf_User); log("\005FILE %s:\n", file->cf_User);
#endif #endif
if (file->cf_Deleted) if (file->cf_Deleted)
continue; continue;
for (line = file->cf_LineBase; line; line = line->cl_Next) { for (line = file->cf_LineBase; line; line = line->cl_Next) {
#ifdef FEATURE_DEBUG_OPT #ifdef FEATURE_DEBUG_OPT
if (DebugOpt) if (DebugOpt)
log(5, " LINE %s\n", line->cl_Shell); log("\005 LINE %s\n", line->cl_Shell);
#endif #endif
if (line->cl_Mins[tp->tm_min] && if (line->cl_Mins[tp->tm_min] &&
line->cl_Hrs[tp->tm_hour] && line->cl_Hrs[tp->tm_hour] &&
@ -852,10 +812,10 @@ TestJobs(time_t t1, time_t t2)
) { ) {
#ifdef FEATURE_DEBUG_OPT #ifdef FEATURE_DEBUG_OPT
if (DebugOpt) if (DebugOpt)
log(5, " JobToDo: %d %s\n", line->cl_Pid, line->cl_Shell); log("\005 JobToDo: %d %s\n", line->cl_Pid, line->cl_Shell);
#endif #endif
if (line->cl_Pid > 0) { if (line->cl_Pid > 0) {
log(8, " process already running: %s %s\n", log("\010 process already running: %s %s\n",
file->cf_User, file->cf_User,
line->cl_Shell line->cl_Shell
); );
@ -885,9 +845,9 @@ RunJobs(void)
for (line = file->cf_LineBase; line; line = line->cl_Next) { for (line = file->cf_LineBase; line; line = line->cl_Next) {
if (line->cl_Pid < 0) { if (line->cl_Pid < 0) {
RunJob(file, line); RunJob(file->cf_User, line);
log(8, "USER %s pid %3d cmd %s\n", log("\010USER %s pid %3d cmd %s\n",
file->cf_User, file->cf_User,
line->cl_Pid, line->cl_Pid,
line->cl_Shell line->cl_Shell
@ -926,7 +886,7 @@ CheckJobs(void)
int r = wait4(line->cl_Pid, &status, WNOHANG, NULL); int r = wait4(line->cl_Pid, &status, WNOHANG, NULL);
if (r < 0 || r == line->cl_Pid) { if (r < 0 || r == line->cl_Pid) {
EndJob(file, line); EndJob(file->cf_User, line);
if (line->cl_Pid) if (line->cl_Pid)
file->cf_Running = 1; file->cf_Running = 1;
} else if (r == 0) { } else if (r == 0) {
@ -941,9 +901,76 @@ CheckJobs(void)
} }
#ifdef CONFIG_FEATURE_CROND_CALL_SENDMAIL
static void
ForkJob(const char *user, CronLine *line, int mailFd,
const char *prog, const char *cmd, const char *arg, const char *mailf)
{
/*
* Fork as the user in question and run program
*/
pid_t pid = fork();
line->cl_Pid = pid;
if (pid == 0) {
/*
* CHILD
*/
/*
* Change running state to the user in question
*/
if (ChangeUser(user) < 0)
exit(0);
#ifdef FEATURE_DEBUG_OPT
if (DebugOpt)
log("\005Child Running %s\n", prog);
#endif
if (mailFd >= 0) {
dup2(mailFd, mailf != NULL);
dup2((mailf ? mailFd : 1), 2);
close(mailFd);
}
execl(prog, prog, cmd, arg, NULL);
log("\024unable to exec, user %s cmd %s %s %s\n", user,
prog, cmd, arg);
if(mailf)
fdprintf(1, "Exec failed: %s -c %s\n", prog, arg);
exit(0);
} else if (pid < 0) {
/*
* FORK FAILED
*/
log("\024couldn't fork, user %s\n", user);
line->cl_Pid = 0;
if(mailf)
remove(mailf);
} else if(mailf) {
/*
* PARENT, FORK SUCCESS
*
* rename mail-file based on pid of process
*/
char mailFile2[128];
snprintf(mailFile2, sizeof(mailFile2), TMPDIR "/cron.%s.%d",
user, pid);
rename(mailf, mailFile2);
}
/*
* Close the mail file descriptor.. we can't just leave it open in
* a structure, closing it later, because we might run out of descriptors
*/
if (mailFd >= 0)
close(mailFd);
}
static void static void
RunJob(CronFile *file, CronLine *line) RunJob(const char *user, CronLine *line)
{ {
char mailFile[128]; char mailFile[128];
int mailFd; int mailFd;
@ -956,87 +983,20 @@ RunJob(CronFile *file, CronLine *line)
*/ */
snprintf(mailFile, sizeof(mailFile), TMPDIR "/cron.%s.%d", snprintf(mailFile, sizeof(mailFile), TMPDIR "/cron.%s.%d",
file->cf_User, getpid()); user, getpid());
mailFd = open(mailFile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL|O_APPEND, 0600); mailFd = open(mailFile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL|O_APPEND, 0600);
if (mailFd >= 0) { if (mailFd >= 0) {
line->cl_MailFlag = 1; line->cl_MailFlag = 1;
fdprintf(mailFd, "To: %s\nSubject: cron: %s\n\n", fdprintf(mailFd, "To: %s\nSubject: cron: %s\n\n", user,
file->cf_User, line->cl_Shell);
line->cl_Shell
);
line->cl_MailPos = lseek(mailFd, 0, 1); line->cl_MailPos = lseek(mailFd, 0, 1);
}
/*
* Fork as the user in question and run program
*/
if ((line->cl_Pid = fork()) == 0) {
/*
* CHILD, FORK OK
*/
/*
* Change running state to the user in question
*/
if (ChangeUser(file->cf_User, 1) < 0)
return;
#ifdef FEATURE_DEBUG_OPT
if (DebugOpt)
log(5, "Child Running %s\n", line->cl_Shell);
#endif
/*
* stdin is already /dev/null, setup stdout and stderr
*/
if (mailFd >= 0) {
dup2(mailFd, 1);
dup2(mailFd, 2);
close(mailFd);
} else {
log_err("unable to create mail file user %s file %s, output to /dev/null\n",
file->cf_User,
mailFile
);
}
execl("/bin/sh", "/bin/sh", "-c", line->cl_Shell, NULL, NULL);
log_err("unable to exec, user %s cmd /bin/sh -c %s\n",
file->cf_User,
line->cl_Shell
);
fdprintf(1, "Exec failed: /bin/sh -c %s\n", line->cl_Shell);
exit(0);
} else if (line->cl_Pid < 0) {
/*
* PARENT, FORK FAILED
*/
log_err("couldn't fork, user %s\n", file->cf_User);
line->cl_Pid = 0;
remove(mailFile);
} else { } else {
/* log("\024unable to create mail file user %s file %s, output to /dev/null\n",
* PARENT, FORK SUCCESS user, mailFile);
*
* rename mail-file based on pid of process
*/
char mailFile2[128];
snprintf(mailFile2, sizeof(mailFile2), TMPDIR "/cron.%s.%d",
file->cf_User, line->cl_Pid);
rename(mailFile, mailFile2);
} }
/* ForkJob(user, line, mailFd, def_sh, "-c", line->cl_Shell, mailFile);
* Close the mail file descriptor.. we can't just leave it open in
* a structure, closing it later, because we might run out of descriptors
*/
if (mailFd >= 0)
close(mailFd);
} }
/* /*
@ -1044,7 +1004,7 @@ RunJob(CronFile *file, CronLine *line)
*/ */
static void static void
EndJob(const CronFile *file, CronLine *line) EndJob(const char *user, CronLine *line)
{ {
int mailFd; int mailFd;
char mailFile[128]; char mailFile[128];
@ -1065,7 +1025,7 @@ EndJob(const CronFile *file, CronLine *line)
*/ */
snprintf(mailFile, sizeof(mailFile), TMPDIR "/cron.%s.%d", snprintf(mailFile, sizeof(mailFile), TMPDIR "/cron.%s.%d",
file->cf_User, line->cl_Pid); user, line->cl_Pid);
line->cl_Pid = 0; line->cl_Pid = 0;
if (line->cl_MailFlag != 1) if (line->cl_MailFlag != 1)
@ -1093,46 +1053,47 @@ EndJob(const CronFile *file, CronLine *line)
close(mailFd); close(mailFd);
return; return;
} }
ForkJob(user, line, mailFd, SENDMAIL, SENDMAIL_ARGS, NULL);
}
#else
/* crond whithout sendmail */
if ((line->cl_Pid = fork()) == 0) { static void
RunJob(const char *user, CronLine *line)
{
/* /*
* CHILD, FORK OK * Fork as the user in question and run program
*/
pid_t pid = fork();
if (pid == 0) {
/*
* CHILD
*/ */
/* /*
* change user id - no way in hell security can be compromised * Change running state to the user in question
* by the mailing and we already verified the mail file.
*/ */
if (ChangeUser(file->cf_User, 1) < 0) if (ChangeUser(user) < 0)
exit(0); exit(0);
/* #ifdef FEATURE_DEBUG_OPT
* run sendmail with mail file as standard input, only if if (DebugOpt)
* mail file exists! log("\005Child Running %s\n", def_sh);
*/ #endif
dup2(mailFd, 0); execl(def_sh, def_sh, "-c", line->cl_Shell, NULL);
dup2(1, 2); log("\024unable to exec, user %s cmd %s -c %s\n", user,
close(mailFd); def_sh, line->cl_Shell);
execl(SENDMAIL, SENDMAIL, SENDMAIL_ARGS, NULL, NULL);
log_err("unable to exec %s %s, user %s, output to sink null",
SENDMAIL,
SENDMAIL_ARGS,
file->cf_User
);
exit(0); exit(0);
} else if (line->cl_Pid < 0) { } else if (pid < 0) {
/* /*
* PARENT, FORK FAILED * FORK FAILED
*/
log_err("unable to fork, user %s", file->cf_User);
line->cl_Pid = 0;
} else {
/*
* PARENT, FORK OK
*/ */
log("\024couldn't fork, user %s\n", user);
pid = 0;
} }
close(mailFd); line->cl_Pid = pid;
} }
#endif /* CONFIG_FEATURE_CROND_CALL_SENDMAIL */

9
networking/Config.in
View File

@ -58,6 +58,13 @@ config CONFIG_FEATURE_HTTPD_BASIC_AUTH
Utilizes password settings from /etc/httpd.conf for basic Utilizes password settings from /etc/httpd.conf for basic
authentication on a per url basis. authentication on a per url basis.
config CONFIG_FEATURE_HTTPD_AUTH_MD5
bool " Enable support MD5 crypted password for httpd.conf"
default n
depends on CONFIG_FEATURE_HTTPD_BASIC_AUTH
help
Please help my - send patch for set this help message
if !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY if !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
config CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP config CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
@ -105,7 +112,7 @@ config CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
config CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV config CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV
bool " Enable setting of CGI_varname=value environment vars for CGI" bool " Enable setting of CGI_varname=value environment vars for CGI"
default y default n
depends on CONFIG_FEATURE_HTTPD_CGI depends on CONFIG_FEATURE_HTTPD_CGI
help help
This option parses POST or GET arguments from a form and This option parses POST or GET arguments from a form and

7
networking/Makefile.in
View File

@ -53,6 +53,13 @@ NETWORKING-$(CONFIG_WGET) += wget.o
libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR) libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR)
needcrypt-y:=
needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y
ifeq ($(needcrypt-y),y)
LIBRARIES += -lcrypt
endif
$(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
$(AR) -ro $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) $(AR) -ro $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))

64
networking/httpd.c
View File

@ -153,12 +153,14 @@ static const char home[] = "./";
/* Config options, disable this for do very small module */ /* Config options, disable this for do very small module */
//#define CONFIG_FEATURE_HTTPD_CGI //#define CONFIG_FEATURE_HTTPD_CGI
//#define CONFIG_FEATURE_HTTPD_BASIC_AUTH //#define CONFIG_FEATURE_HTTPD_BASIC_AUTH
//#define CONFIG_FEATURE_HTTPD_AUTH_MD5
#ifdef HTTPD_STANDALONE #ifdef HTTPD_STANDALONE
/* standalone, enable all features */ /* standalone, enable all features */
#undef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY #undef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
/* unset config option for remove warning as redefined */ /* unset config option for remove warning as redefined */
#undef CONFIG_FEATURE_HTTPD_BASIC_AUTH #undef CONFIG_FEATURE_HTTPD_BASIC_AUTH
#undef CONFIG_FEATURE_HTTPD_AUTH_MD5
#undef CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV #undef CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV
#undef CONFIG_FEATURE_HTTPD_ENCODE_URL_STR #undef CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
#undef CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV #undef CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
@ -168,6 +170,7 @@ static const char home[] = "./";
#undef CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP #undef CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
/* enable all features now */ /* enable all features now */
#define CONFIG_FEATURE_HTTPD_BASIC_AUTH #define CONFIG_FEATURE_HTTPD_BASIC_AUTH
#define CONFIG_FEATURE_HTTPD_AUTH_MD5
#define CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV #define CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV
#define CONFIG_FEATURE_HTTPD_ENCODE_URL_STR #define CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
#define CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV #define CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
@ -425,11 +428,11 @@ static void parse_conf(const char *path, int flag)
} }
while((f = fopen(cf, "r")) == NULL) { while((f = fopen(cf, "r")) == NULL) {
if(flag != FIRST_PARSE) { if(flag == SUBDIR_PARSE || flag == FIND_FROM_HTTPD_ROOT) {
/* config file not found, no changes to config */ /* config file not found, no changes to config */
return; return;
} }
if(config->configFile) /* if -c option given */ if(config->configFile && flag == FIRST_PARSE) /* if -c option given */
bb_perror_msg_and_die("%s", cf); bb_perror_msg_and_die("%s", cf);
flag = FIND_FROM_HTTPD_ROOT; flag = FIND_FROM_HTTPD_ROOT;
cf = httpd_conf; cf = httpd_conf;
@ -1326,10 +1329,38 @@ static int checkPerm(const char *path, const char *request)
if(strncmp(p0, path, l) == 0 && if(strncmp(p0, path, l) == 0 &&
(l == 1 || path[l] == '/' || path[l] == 0)) { (l == 1 || path[l] == '/' || path[l] == 0)) {
/* path match found. Check request */ /* path match found. Check request */
/* for check next /path:user:password */
prev = p0;
#ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
{
char *cipher;
char *pp;
char *u = strchr(request, ':');
if(u == NULL) {
/* bad request, ':' required */
continue;
}
if(strncmp(p, request, u-request) != 0) {
/* user uncompared */
continue;
}
pp = strchr(p, ':');
if(pp && pp[1] == '$' && pp[2] == '1' &&
pp[3] == '$' && pp[4]) {
pp++;
cipher = pw_encrypt(u+1, pp);
if (strcmp(cipher, pp) == 0)
return 1; /* Ok */
/* unauthorized */
continue;
}
}
#endif
if (strcmp(p, request) == 0) if (strcmp(p, request) == 0)
return 1; /* Ok */ return 1; /* Ok */
/* unauthorized, but check next /path:user:password */ /* unauthorized */
prev = p0;
} }
} }
} /* for */ } /* for */
@ -1731,7 +1762,12 @@ static const char httpd_opts[]="c:d:h:"
#endif #endif
#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
"r:" "r:"
#define OPT_INC_2 1 # ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
"m:"
# define OPT_INC_2 2
# else
# define OPT_INC_2 1
#endif
#else #else
#define OPT_INC_2 0 #define OPT_INC_2 0
#endif #endif
@ -1740,14 +1776,15 @@ static const char httpd_opts[]="c:d:h:"
#ifdef CONFIG_FEATURE_HTTPD_SETUID #ifdef CONFIG_FEATURE_HTTPD_SETUID
"u:" "u:"
#endif #endif
#endif #endif /* CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY */
; ;
#define OPT_CONFIG_FILE (1<<0) #define OPT_CONFIG_FILE (1<<0)
#define OPT_DECODE_URL (1<<1) #define OPT_DECODE_URL (1<<1)
#define OPT_HOME_HTTPD (1<<2) #define OPT_HOME_HTTPD (1<<2)
#define OPT_ENCODE_URL (1<<(2+OPT_INC_1)) #define OPT_ENCODE_URL (1<<(2+OPT_INC_1))
#define OPT_REALM (1<<(2+OPT_INC_1+OPT_INC_2)) #define OPT_REALM (1<<(3+OPT_INC_1))
#define OPT_MD5 (1<<(4+OPT_INC_1))
#define OPT_PORT (1<<(3+OPT_INC_1+OPT_INC_2)) #define OPT_PORT (1<<(3+OPT_INC_1+OPT_INC_2))
#define OPT_DEBUG (1<<(4+OPT_INC_1+OPT_INC_2)) #define OPT_DEBUG (1<<(4+OPT_INC_1+OPT_INC_2))
#define OPT_SETUID (1<<(5+OPT_INC_1+OPT_INC_2)) #define OPT_SETUID (1<<(5+OPT_INC_1+OPT_INC_2))
@ -1778,6 +1815,10 @@ int httpd_main(int argc, char *argv[])
long uid = -1; long uid = -1;
#endif #endif
#ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
const char *pass;
#endif
config = xcalloc(1, sizeof(*config)); config = xcalloc(1, sizeof(*config));
#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
config->realm = "Web Server Authentication"; config->realm = "Web Server Authentication";
@ -1796,6 +1837,9 @@ int httpd_main(int argc, char *argv[])
#endif #endif
#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
, &(config->realm) , &(config->realm)
# ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
, &pass
# endif
#endif #endif
#ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
, &s_port , &s_port
@ -1815,6 +1859,12 @@ int httpd_main(int argc, char *argv[])
return 0; return 0;
} }
#endif #endif
#ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
if(opt & OPT_MD5) {
printf("%s\n", pw_encrypt(pass, "$1$"));
return 0;
}
#endif
#ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
if(opt & OPT_PORT) if(opt & OPT_PORT)
config->port = bb_xgetlarg(s_port, 10, 1, 0xffff); config->port = bb_xgetlarg(s_port, 10, 1, 0xffff);

24
networking/inetd.c
View File

@ -806,7 +806,9 @@ inetd_main(int argc, char *argv[])
struct passwd *pwd; struct passwd *pwd;
struct group *grp = NULL; struct group *grp = NULL;
struct sigaction sa; struct sigaction sa;
int ch, pid; int pid;
unsigned long opt;
char *sq;
gid_t gid; gid_t gid;
#ifdef INETD_UNSUPPORT_BILTIN #ifdef INETD_UNSUPPORT_BILTIN
@ -828,14 +830,21 @@ inetd_main(int argc, char *argv[])
LastArg = environ[-1] + strlen(environ[-1]); LastArg = environ[-1] + strlen(environ[-1]);
#endif #endif
while ((ch = getopt(argc, argv, "q:")) != EOF) #if defined(__uClinux__)
switch(ch) { opt = bb_getopt_ulflags(argc, argv, "q:f", &sq);
case 'q': if (!(opt & 4)) {
daemon(0, 0);
/* reexec for vfork() do continue parent */
vfork_daemon_rexec(argc, argv, "-f");
}
#else
opt = bb_getopt_ulflags(ac, av, "q:", &sq);
daemon(0, 0);
#endif /* uClinux */
if(opt & 1) {
global_queuelen = atoi(optarg); global_queuelen = atoi(optarg);
if (global_queuelen < 8) global_queuelen=8; if (global_queuelen < 8) global_queuelen=8;
break;
default:
bb_show_usage(); // "[-q len] [conf]"
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
@ -843,7 +852,6 @@ inetd_main(int argc, char *argv[])
if (argc > 0) if (argc > 0)
CONFIG = argv[0]; CONFIG = argv[0];
daemon(0, 0);
openlog(bb_applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON); openlog(bb_applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
{ {
FILE *fp; FILE *fp;

4
sysklogd/klogd.c
View File

@ -150,8 +150,8 @@ extern int klogd_main(int argc, char **argv)
#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__) #if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
if (daemon(0, 1) < 0) if (daemon(0, 1) < 0)
bb_perror_msg_and_die("daemon"); bb_perror_msg_and_die("daemon");
#else #if defined(__uClinux__)
bb_error_msg_and_die("daemon not supported"); vfork_daemon_rexec(argc, argv, "-n");
#endif #endif
} }
doKlogd(console_log_level); doKlogd(console_log_level);

5
sysklogd/syslogd.c
View File

@ -632,11 +632,12 @@ extern int syslogd_main(int argc, char **argv)
umask(0); umask(0);
#if ! defined(__uClinux__)
if ((doFork == TRUE) && (daemon(0, 1) < 0)) { if ((doFork == TRUE) && (daemon(0, 1) < 0)) {
bb_perror_msg_and_die("daemon"); bb_perror_msg_and_die("daemon");
} #if ! defined(__uClinux__)
vfork_daemon_rexec(argc, argv, "-n");
#endif #endif
}
doSyslogd(); doSyslogd();
return EXIT_SUCCESS; return EXIT_SUCCESS;