BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crond: don't start sendmail with absolute path 

crond: don't report obsolete version, report true bbox version
1_7_stable
Denis Vlasenko 2007-08-18 15:48:00 +00:00
parent fe7cd642b0
commit b9c02dd791
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
miscutils/crond.c
View File

@ -5,16 +5,14 @@
* run as root, but NOT setuid root * run as root, but NOT setuid root
* *
* Copyright 1994 Matthew Dillon (dillon@apollo.west.oic.com) * Copyright 1994 Matthew Dillon (dillon@apollo.west.oic.com)
* (version 2.3.2)
* Vladimir Oleynik <dzo@simtreas.ru> (C) 2002 * Vladimir Oleynik <dzo@simtreas.ru> (C) 2002
* *
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * 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 <sys/syslog.h>
#include "libbb.h"
#ifndef CRONTABS #ifndef CRONTABS
#define CRONTABS "/var/spool/cron/crontabs" #define CRONTABS "/var/spool/cron/crontabs"
@ -23,7 +21,7 @@
#define TMPDIR "/var/spool/cron" #define TMPDIR "/var/spool/cron"
#endif #endif
#ifndef SENDMAIL #ifndef SENDMAIL
#define SENDMAIL "/usr/sbin/sendmail" #define SENDMAIL "sendmail"
#endif #endif
#ifndef SENDMAIL_ARGS #ifndef SENDMAIL_ARGS
#define SENDMAIL_ARGS "-ti", "oem" #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 * main loop - synchronize to 1 second after the minute, minimum sleep
* of 1 second. * 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); applet_name, LogLevel);
SynchronizeDir(); SynchronizeDir();
@ -941,8 +939,10 @@ static void EndJob(const char *user, CronLine * line)
return; return;
} }
if (fstat(mailFd, &sbuf) < 0 || sbuf.st_uid != DaemonUid || sbuf.st_nlink != 0 || if (fstat(mailFd, &sbuf) < 0 || sbuf.st_uid != DaemonUid
sbuf.st_size == line->cl_MailPos || !S_ISREG(sbuf.st_mode)) { || sbuf.st_nlink != 0 || sbuf.st_size == line->cl_MailPos
|| !S_ISREG(sbuf.st_mode)
) {
close(mailFd); close(mailFd);
return; return;
} }