- add patch for enabling foreground operation without debug

PR:		250708
Submitted by:	dewayne@heuristicsystems.com.au
This commit is contained in:
Dirk Meyer 2020-12-31 12:14:42 +00:00
parent acd72c6cf2
commit db468c1ae1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=559726
2 changed files with 40 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= milter-regex
PORTVERSION= 2.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= https://www.benzedrine.ch/

View File

@ -0,0 +1,39 @@
--- milter-regex.c.orig 2020-10-07 13:25:30.000000000 +1100
+++ milter-regex.c 2020-10-07 13:26:01.000000000 +1100
@@ -61,7 +61,7 @@
size_t);
static const char *rule_file_name = "/etc/milter-regex.conf";
-static int debug = 0;
+static int debug = 0, foreground = 0;
static unsigned maxlines = 0;
static pthread_mutex_t mutex;
@@ -697,7 +697,7 @@
int test_ruleset = 0;
FILE *f = NULL;
- while ((ch = getopt(argc, argv, "c:df:j:l:m:p:r:tu:G:P:U:")) != -1) {
+ while ((ch = getopt(argc, argv, "c:dFf:j:l:m:p:r:tu:G:P:U:")) != -1) {
switch (ch) {
case 'c':
rule_file_name = optarg;
@@ -705,6 +705,9 @@
case 'd':
debug = 1;
break;
+ case 'F':
+ foreground = 1;
+ break;
case 'f': {
int i;
@@ -863,7 +866,7 @@
}
/* daemonize (detach from controlling terminal) */
- if (!debug && daemon(0, 0)) {
+ if ( !debug && !foreground && daemon(0, 0)) {
perror("daemon");
goto done;
}