b9c02dd79
Denis Vlasenko
2007-08-18
Subject
crond: don't start sendmail with absolute path crond: don't report obsolete version, report true bbox version
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/crond.c+8 -8
| @@ -5,16 +5,14 @@ | |
| * run as root, but NOT setuid root | |
| * | |
| * Copyright 1994 Matthew Dillon ([email protected]) | |
| + | * (version 2.3.2) |
| * Vladimir Oleynik <[email protected]> (C) 2002 | |
| * | |
| * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | |
| */ | |
| - | #define VERSION "2.3.2" |
| - | |
| - | #include "libbb.h" |
| #include <sys/syslog.h> | |
| - | |
| + | #include "libbb.h" |
| #ifndef CRONTABS | |
| #define CRONTABS "/var/spool/cron/crontabs" | |
| @@ -23,7 +21,7 @@ | |
| #define TMPDIR "/var/spool/cron" | |
| #endif | |
| #ifndef SENDMAIL | |
| - | #define SENDMAIL "/usr/sbin/sendmail" |
| + | #define SENDMAIL "sendmail" |
| #endif | |
| #ifndef SENDMAIL_ARGS | |
| #define SENDMAIL_ARGS "-ti", "oem" | |
| @@ -172,7 +170,7 @@ int crond_main(int ac, char **av) | |
| * main loop - synchronize to 1 second after the minute, minimum sleep | |
| * of 1 second. | |
| */ | |
| - | crondlog("\011%s " VERSION " dillon, started, log level %d\n", |
| + | crondlog("\011%s " BB_VER " started, log level %d\n", |
| applet_name, LogLevel); | |
| SynchronizeDir(); | |
| @@ -941,8 +939,10 @@ static void EndJob(const char *user, CronLine * line) | |
| return; | |
| } | |
| - | if (fstat(mailFd, &sbuf) < 0 || sbuf.st_uid != DaemonUid || sbuf.st_nlink != 0 || |
| - | sbuf.st_size == line->cl_MailPos || !S_ISREG(sbuf.st_mode)) { |
| + | if (fstat(mailFd, &sbuf) < 0 || sbuf.st_uid != DaemonUid |
| + | || sbuf.st_nlink != 0 || sbuf.st_size == line->cl_MailPos |
| + | || !S_ISREG(sbuf.st_mode) |
| + | ) { |
| close(mailFd); | |
| return; | |
| } | |