diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-07-10 13:55:25 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-07-10 16:42:54 +0100 |
| commit | 99ea5f6faeaf714e34bbcd75fdc50cc94dc7a1c8 (patch) | |
| tree | 19623428c3983a1e84e03529c64460380e56bceb /src | |
| parent | 3c90bbcdc7cf73298156f7bcd5f5e750e7814e72 (diff) | |
Command-line option for no notifier socket. Bug 2616
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/daemon.c | 5 | ||||
| -rw-r--r-- | src/src/exim.c | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/src/daemon.c b/src/src/daemon.c index c376f27c7..f56e36a10 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -1007,6 +1007,11 @@ const uschar * where; struct sockaddr_un sa_un = {.sun_family = AF_UNIX}; int len; +if (!notifier_socket || !*notifier_socket) + { + DEBUG(D_any) debug_printf("-oY used so not creating notifier socket\n"); + return; + } if (override_local_interfaces && !override_pid_file_path) { DEBUG(D_any) diff --git a/src/src/exim.c b/src/src/exim.c index c0ef9150a..25464f799 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -3208,6 +3208,13 @@ on the second character (the one after '-'), to save some effort. */ else override_local_interfaces = string_copy_taint(argv[++i], TRUE); break; + /* -oY: Override creation of daemon notifier socket */ + + case 'Y': + if (*argrest) badarg = TRUE; + else notifier_socket = NULL; + break; + /* Unknown -o argument */ default: @@ -4775,7 +4782,7 @@ if (!originator_login || f.running_in_test_harness) /* Ensure that the user name is in a suitable form for use as a "phrase" in an RFC822 address.*/ -originator_name = parse_fix_phrase(originator_name, Ustrlen(originator_name)); +originator_name = US parse_fix_phrase(originator_name, Ustrlen(originator_name)); /* If a message is created by this call of Exim, the uid/gid of its originator are those of the caller. These values are overridden if an existing message is |