2006-06-14 21:13:00 +02:00
|
|
|
$NetBSD: patch-aa,v 1.3 2006/06/14 19:13:00 tron Exp $
|
Update mail/milter-regex to 1.5.
Also fix seteuid/setuid usage on NetBSD.
Changes from 1.2:
1.5: March 19, 2004
Fix logic errors in dealing with multi-message connections (SMTP RSET,
HELO or MAIL FROM resetting SMTP state). Add cb_abort callback.
1.4: March 13, 2004
Some performance improvements, abort rule evaluation immediately when
no further rules can possibly match. Compile without -Werror, as some
ports generate warnings.
1.3: March 8, 2004
Two bugfixes related to RCPT TO: rule evaluation (DSN options and
multiple receipients would match incorrectly), umask(0177) for pipe,
fix for Solaris daemon() implementation. Improved logging (From:, To:
and Subject: headers, when available).
[update during freeze approved by agc]
2004-06-12 01:11:48 +02:00
|
|
|
|
2006-06-14 21:13:00 +02:00
|
|
|
--- milter-regex.c.orig 2005-03-06 11:42:53.000000000 +0000
|
|
|
|
+++ milter-regex.c 2006-06-14 20:03:06.000000000 +0100
|
|
|
|
@@ -561,7 +561,7 @@
|
|
|
|
const char *ofile = NULL;
|
|
|
|
|
|
|
|
tzset();
|
|
|
|
- openlog("milter-regex", LOG_PID | LOG_NDELAY, LOG_DAEMON);
|
|
|
|
+ openlog("milter-regex", LOG_PID | LOG_NDELAY, LOG_MAIL);
|
|
|
|
|
|
|
|
while ((ch = getopt(argc, argv, "c:dp:u:")) != -1) {
|
|
|
|
switch (ch) {
|
|
|
|
@@ -609,7 +609,7 @@
|
Update mail/milter-regex to 1.5.
Also fix seteuid/setuid usage on NetBSD.
Changes from 1.2:
1.5: March 19, 2004
Fix logic errors in dealing with multi-message connections (SMTP RSET,
HELO or MAIL FROM resetting SMTP state). Add cb_abort callback.
1.4: March 13, 2004
Some performance improvements, abort rule evaluation immediately when
no further rules can possibly match. Compile without -Werror, as some
ports generate warnings.
1.3: March 8, 2004
Two bugfixes related to RCPT TO: rule evaluation (DSN options and
multiple receipients would match incorrectly), umask(0177) for pipe,
fix for Solaris daemon() implementation. Improved logging (From:, To:
and Subject: headers, when available).
[update during freeze approved by agc]
2004-06-12 01:11:48 +02:00
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
if (
|
|
|
|
-#if ! ( __linux__ || __sun__ )
|
2006-04-30 19:11:25 +02:00
|
|
|
+#if ! ( __linux__ || __sun__ || __NetBSD__ || defined(__DragonFly__) )
|
Update mail/milter-regex to 1.5.
Also fix seteuid/setuid usage on NetBSD.
Changes from 1.2:
1.5: March 19, 2004
Fix logic errors in dealing with multi-message connections (SMTP RSET,
HELO or MAIL FROM resetting SMTP state). Add cb_abort callback.
1.4: March 13, 2004
Some performance improvements, abort rule evaluation immediately when
no further rules can possibly match. Compile without -Werror, as some
ports generate warnings.
1.3: March 8, 2004
Two bugfixes related to RCPT TO: rule evaluation (DSN options and
multiple receipients would match incorrectly), umask(0177) for pipe,
fix for Solaris daemon() implementation. Improved logging (From:, To:
and Subject: headers, when available).
[update during freeze approved by agc]
2004-06-12 01:11:48 +02:00
|
|
|
seteuid(pw->pw_uid) ||
|
|
|
|
#endif
|
|
|
|
setuid(pw->pw_uid)) {
|