|
 |
61a4790 |
diff -ur b/atd.c a/atd.c
|
|
|
61a4790 |
--- b/atd.c 2022-02-22 15:21:06.649147600 +0100
|
|
|
61a4790 |
+++ a/atd.c 2022-02-22 15:49:13.640184845 +0100
|
|
|
61a4790 |
@@ -98,6 +98,10 @@
|
|
 |
9b663b7 |
#define BATCH_INTERVAL_DEFAULT 60
|
|
|
9b663b7 |
#define CHECK_INTERVAL 3600
|
|
|
9b663b7 |
|
|
|
9b663b7 |
+#ifndef MAXHOSTNAMELEN
|
|
|
9b663b7 |
+#define MAXHOSTNAMELEN 64
|
|
|
9b663b7 |
+#endif
|
|
|
9b663b7 |
+
|
|
|
9b663b7 |
/* Global variables */
|
|
|
9b663b7 |
|
|
|
9b663b7 |
uid_t real_uid, effective_uid;
|
|
|
61a4790 |
@@ -115,6 +119,7 @@
|
|
|
61a4790 |
static int nothing_to_do = 0;
|
|
|
9b663b7 |
unsigned int batch_interval;
|
|
|
9b663b7 |
static int run_as_daemon = 0;
|
|
|
9b663b7 |
+static int mail_with_hostname = 0;
|
|
|
61a4790 |
static int hupped = 0;
|
|
|
9b663b7 |
|
|
|
9b663b7 |
static volatile sig_atomic_t term_signal = 0;
|
|
|
61a4790 |
@@ -301,6 +306,7 @@
|
|
|
9b663b7 |
char fmt[64];
|
|
|
9b663b7 |
unsigned long jobno;
|
|
|
9b663b7 |
int rc;
|
|
|
9b663b7 |
+ char hostbuf[MAXHOSTNAMELEN];
|
|
|
6d4186b |
#ifdef WITH_PAM
|
|
|
9b663b7 |
int retcode;
|
|
|
9b663b7 |
#endif
|
|
|
61a4790 |
@@ -455,6 +461,11 @@
|
|
|
9b663b7 |
|
|
|
9b663b7 |
write_string(fd_out, "Subject: Output from your job ");
|
|
|
9b663b7 |
write_string(fd_out, jobbuf);
|
|
|
9b663b7 |
+ if (mail_with_hostname > 0) {
|
|
|
61a4790 |
+ gethostname(hostbuf, MAXHOSTNAMELEN-1);
|
|
|
9b663b7 |
+ write_string(fd_out, " ");
|
|
|
9b663b7 |
+ write_string(fd_out, hostbuf);
|
|
|
9b663b7 |
+ }
|
|
|
9b663b7 |
write_string(fd_out, "\nTo: ");
|
|
|
9b663b7 |
write_string(fd_out, mailname);
|
|
|
9b663b7 |
write_string(fd_out, "\n\n");
|
|
|
61a4790 |
@@ -905,7 +916,7 @@
|
|
|
9b663b7 |
run_as_daemon = 1;
|
|
|
9b663b7 |
batch_interval = BATCH_INTERVAL_DEFAULT;
|
|
|
9b663b7 |
|
|
|
9b663b7 |
- while ((c = getopt(argc, argv, "sdl:b:f")) != EOF) {
|
|
|
9b663b7 |
+ while ((c = getopt(argc, argv, "sdnl:b:f")) != EOF) {
|
|
|
9b663b7 |
switch (c) {
|
|
|
9b663b7 |
case 'l':
|
|
|
9b663b7 |
if (sscanf(optarg, "%lf", &load_avg) != 1)
|
|
|
61a4790 |
@@ -927,6 +938,10 @@
|
|
|
9b663b7 |
daemon_foreground++;
|
|
|
9b663b7 |
break;
|
|
|
9b663b7 |
|
|
|
9b663b7 |
+ case 'n':
|
|
|
9b663b7 |
+ mail_with_hostname=1;
|
|
|
9b663b7 |
+ break;
|
|
|
9b663b7 |
+
|
|
|
9b663b7 |
case 's':
|
|
|
9b663b7 |
run_as_daemon = 0;
|
|
|
9b663b7 |
break;
|