mirror of
https://git.freebsd.org/ports.git
synced 2025-06-03 03:46:30 -04:00
f6d607e915
- take maintainer - add -z flag to not send mail for 0.0.0.0 IPs from busy dhcp networks - makepatch conform patchfiles
76 lines
2.2 KiB
C
76 lines
2.2 KiB
C
--- report.c.orig 2000-09-30 23:41:10 UTC
|
|
+++ report.c
|
|
@@ -45,6 +45,8 @@ struct rtentry;
|
|
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
+#include <fcntl.h>
|
|
+#include <paths.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
@@ -70,6 +72,8 @@ struct rtentry;
|
|
|
|
#define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
|
|
|
|
+extern char *Watcher;
|
|
+
|
|
static int cdepth; /* number of outstanding children */
|
|
|
|
static char *fmtdate(time_t);
|
|
@@ -240,7 +244,7 @@ report(register char *title, register u_
|
|
register FILE *f;
|
|
char tempfile[64], cpu[64], os[64];
|
|
char *fmt = "%20s: %s\n";
|
|
- char *watcher = WATCHER;
|
|
+ char *watcher = Watcher ? Watcher : WATCHER;
|
|
char *watchee = WATCHEE;
|
|
char *sendmail = PATH_SENDMAIL;
|
|
char *unknown = "<unknown>";
|
|
@@ -251,6 +255,11 @@ report(register char *title, register u_
|
|
if (initializing)
|
|
return;
|
|
|
|
+ /* No mail for 0.0.0.0 if -z */
|
|
+ if (zeroflag == 1 && strncmp("0.0.0.0",intoa(a),16) == 0 ) {
|
|
+ dosyslog(LOG_NOTICE, title, a, e1, e2);
|
|
+ return;
|
|
+ }
|
|
if (debug) {
|
|
if (debug > 1) {
|
|
dosyslog(LOG_NOTICE, title, a, e1, e2);
|
|
@@ -303,7 +312,7 @@ report(register char *title, register u_
|
|
(void)fprintf(f, "From: %s\n", watchee);
|
|
(void)fprintf(f, "To: %s\n", watcher);
|
|
hn = gethname(a);
|
|
- if (!isdigit(*hn))
|
|
+ if (hn != NULL)
|
|
(void)fprintf(f, "Subject: %s (%s)\n", title, hn);
|
|
else {
|
|
(void)fprintf(f, "Subject: %s\n", title);
|
|
@@ -344,6 +353,25 @@ report(register char *title, register u_
|
|
exit(1);
|
|
}
|
|
/* XXX Need to freopen()? */
|
|
+
|
|
+ /*
|
|
+ * Open /dev/null as stdout and stderr so that sendmail 8.12.1 (and
|
|
+ * above ?) won't complain about missing file descriptors.
|
|
+ */
|
|
+ if ((fd = open(_PATH_DEVNULL, O_RDWR)) == -1) {
|
|
+ syslog(LOG_ERR, "Cannot open %s: %m", _PATH_DEVNULL);
|
|
+ exit(1);
|
|
+ }
|
|
+ if (dup2(fd, STDOUT_FILENO) == -1) {
|
|
+ syslog(LOG_ERR, "Cannot dup2 %s to stdout: %m", _PATH_DEVNULL);
|
|
+ exit(1);
|
|
+ }
|
|
+ if (dup2(fd, STDERR_FILENO) == -1) {
|
|
+ syslog(LOG_ERR, "Cannot dup2 %s to stderr: %m", _PATH_DEVNULL);
|
|
+ exit(1);
|
|
+ }
|
|
+ close(fd);
|
|
+
|
|
/* Always Deliver interactively (pause when child depth gets large) */
|
|
execl(sendmail, "sendmail", "-odi", watcher, NULL);
|
|
syslog(LOG_ERR, "execl: %s: %m", sendmail);
|