Blame at-3.1.11-log.patch
|
Marcela Mašláňová |
f2de85 |
diff -up at-3.1.11/at.c.log at-3.1.11/at.c
|
|
Marcela Mašláňová |
f2de85 |
diff -up at-3.1.11/atd.c.log at-3.1.11/atd.c
|
|
Marcela Mašláňová |
f2de85 |
--- at-3.1.11/atd.c.log 2009-10-01 13:05:17.000000000 +0200
|
|
Marcela Mašláňová |
f2de85 |
+++ at-3.1.11/atd.c 2009-10-01 13:25:48.437638709 +0200
|
|
Marcela Mašláňová |
f2de85 |
@@ -83,6 +83,10 @@
|
|
Marcela Mašláňová |
f2de85 |
#include "getloadavg.h"
|
|
Marcela Mašláňová |
f2de85 |
#endif
|
|
Marcela Mašláňová |
f2de85 |
|
|
Marcela Mašláňová |
f2de85 |
+#ifndef LOG_ATD
|
|
Marcela Mašláňová |
f2de85 |
+#define LOG_ATD LOG_DAEMON
|
|
Marcela Mašláňová |
f2de85 |
+#endif
|
|
Marcela Mašláňová |
f2de85 |
+
|
|
Marcela Mašláňová |
f2de85 |
/* Macros */
|
|
Marcela Mašláňová |
f2de85 |
|
|
Marcela Mašláňová |
f2de85 |
#define BATCH_INTERVAL_DEFAULT 60
|
|
Marcela Mašláňová |
f2de85 |
@@ -195,6 +199,19 @@ myfork()
|
|
Marcela Mašláňová |
f2de85 |
#define fork myfork
|
|
Marcela Mašláňová |
f2de85 |
#endif
|
|
Marcela Mašláňová |
f2de85 |
|
|
Marcela Mašláňová |
f2de85 |
+#undef ATD_MAIL_PROGRAM
|
|
Marcela Mašláňová |
f2de85 |
+#undef ATD_MAIL_NAME
|
|
Marcela Mašláňová |
f2de85 |
+#if defined(SENDMAIL)
|
|
Marcela Mašláňová |
f2de85 |
+#define ATD_MAIL_PROGRAM SENDMAIL
|
|
Marcela Mašláňová |
f2de85 |
+#define ATD_MAIL_NAME "sendmail"
|
|
Marcela Mašláňová |
f2de85 |
+#elif defined(MAILC)
|
|
Marcela Mašláňová |
f2de85 |
+#define ATD_MAIL_PROGRAM MAILC
|
|
Marcela Mašláňová |
f2de85 |
+#define ATD_MAIL_NAME "mail"
|
|
Marcela Mašláňová |
f2de85 |
+#elif defined(MAILX)
|
|
Marcela Mašláňová |
f2de85 |
+#define ATD_MAIL_PROGRAM MAILX
|
|
Marcela Mašláňová |
f2de85 |
+#define ATD_MAIL_NAME "mailx"
|
|
Marcela Mašláňová |
f2de85 |
+#endif
|
|
Marcela Mašláňová |
f2de85 |
+
|
|
Marcela Mašláňová |
f2de85 |
static void
|
|
Marcela Mašláňová |
f2de85 |
run_file(const char *filename, uid_t uid, gid_t gid)
|
|
Marcela Mašláňová |
f2de85 |
{
|
|
Marcela Mašláňová |
f2de85 |
@@ -718,11 +735,7 @@ main(int argc, char *argv[])
|
|
Marcela Mašláňová |
f2de85 |
|
|
Marcela Mašláňová |
f2de85 |
RELINQUISH_PRIVS_ROOT(daemon_uid, daemon_gid)
|
|
Marcela Mašláňová |
f2de85 |
|
|
Marcela Mašláňová |
f2de85 |
-#ifndef LOG_CRON
|
|
Marcela Mašláňová |
f2de85 |
-#define LOG_CRON LOG_DAEMON
|
|
Marcela Mašláňová |
f2de85 |
-#endif
|
|
Marcela Mašláňová |
f2de85 |
-
|
|
Marcela Mašláňová |
f2de85 |
- openlog("atd", LOG_PID, LOG_CRON);
|
|
Marcela Mašláňová |
f2de85 |
+ openlog("atd", LOG_PID, LOG_ATD);
|
|
Marcela Mašláňová |
f2de85 |
|
|
Marcela Mašláňová |
f2de85 |
opterr = 0;
|
|
Marcela Mašláňová |
f2de85 |
errno = 0;
|