diff options
Diffstat (limited to 'mail/sendmail/files/patch-aa')
| -rw-r--r-- | mail/sendmail/files/patch-aa | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/mail/sendmail/files/patch-aa b/mail/sendmail/files/patch-aa index c353c5ad932f..fabf2051d2cb 100644 --- a/mail/sendmail/files/patch-aa +++ b/mail/sendmail/files/patch-aa @@ -104,9 +104,9 @@ diff -ur mail.local/mail.local.8.orig mail.local/mail.local.8 getservbyname(3), comsat(8), diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c ---- mail.local/mail.local.c.orig Thu May 10 02:58:31 2001 -+++ mail.local/mail.local.c Thu May 31 07:39:04 2001 -@@ -130,6 +132,8 @@ +--- mail.local/mail.local.c.orig Mon Nov 3 19:38:29 2003 ++++ mail.local/mail.local.c Tue May 18 07:56:42 2004 +@@ -144,6 +144,8 @@ bool HoldErrs = false; /* Hold errors in ErrBuf */ bool LMTPMode = false; bool BounceQuota = false; /* permanent error when over quota */ @@ -114,17 +114,20 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c +bool NoFsync = false; char *HomeMailFile = NULL; /* store mail in homedir */ - void deliver __P((int, char *)); -@@ -172,7 +176,7 @@ - # endif /* LOG_MAIL */ - - from = NULL; + #if HASHSPOOL +@@ -205,9 +207,9 @@ + exit(EX_CONFIG); + } + #if HASHSPOOL +- while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:n")) != -1) ++ while ((ch = getopt(argc, argv, "7bBdD:f:h:r:lsH:p:n")) != -1) + #else /* HASHSPOOL */ - while ((ch = getopt(argc, argv, "7bdD:f:h:r:l")) != -1) + while ((ch = getopt(argc, argv, "7bBdD:f:h:r:ls")) != -1) + #endif /* HASHSPOOL */ { switch(ch) - { -@@ -180,6 +184,10 @@ +@@ -216,6 +218,10 @@ EightBitMime = false; break; @@ -135,9 +138,9 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c case 'b': /* bounce mail when over quota. */ BounceQuota = true; break; -@@ -215,6 +223,10 @@ - LMTPMode = true; +@@ -307,6 +313,10 @@ break; + #endif /* HASHSPOOL */ + case 's': + NoFsync = true; @@ -146,7 +149,7 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c case '?': default: usage(); -@@ -224,7 +236,8 @@ +@@ -316,7 +326,8 @@ argv += optind; /* initialize biff structures */ @@ -156,15 +159,15 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c err = sm_mbdb_initialize(mbdbname); if (err != EX_OK) -@@ -1128,6 +1141,7 @@ +@@ -1239,6 +1250,7 @@ - /* Get the starting offset of the new message for biff. */ + /* Get the starting offset of the new message */ curoff = lseek(mbfd, (off_t) 0, SEEK_END); + if (!NoBiff) (void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n", name, (LONGLONG_T) curoff); -@@ -1190,7 +1204,7 @@ +@@ -1301,7 +1313,7 @@ } /* Flush to disk, don't wait for update. */ @@ -173,16 +176,16 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c { mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno)); err3: -@@ -1216,7 +1230,7 @@ - mailerr(errcode, "%s: %s", path, sm_errstring(errno)); - (void) truncate(path, curoff); +@@ -1368,7 +1380,7 @@ + /* Attempt to truncate back to pre-write size */ + goto err3; } - else + else if (!NoBiff) notifybiff(biffmsg); if (setreuid(0, 0) < 0) -@@ -1395,7 +1409,8 @@ +@@ -1547,7 +1559,8 @@ usage() { ExitVal = EX_USAGE; |