From f27af3acacc45220a28115dd27c4ca2ecc79752a Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Thu, 2 Jan 2003 04:32:29 +0000 Subject: - Update to 8.12.7 --- mail/sendmail812/files/patch-recipient.c | 11 ------ mail/sendmail812/files/patch-sfsasl.c | 23 ------------ mail/sendmail812/files/patch-smrsh.c | 63 -------------------------------- 3 files changed, 97 deletions(-) delete mode 100644 mail/sendmail812/files/patch-recipient.c delete mode 100644 mail/sendmail812/files/patch-sfsasl.c delete mode 100644 mail/sendmail812/files/patch-smrsh.c (limited to 'mail/sendmail812/files') diff --git a/mail/sendmail812/files/patch-recipient.c b/mail/sendmail812/files/patch-recipient.c deleted file mode 100644 index bad745c91557..000000000000 --- a/mail/sendmail812/files/patch-recipient.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sendmail/recipient.c 29 May 2002 18:20:03 -0000 8.330 -+++ sendmail/recipient.c 27 Aug 2002 20:21:02 -0000 8.330.2.1 -@@ -679,7 +679,7 @@ - ** the current recipient is marked expensive. - */ - -- if (WILL_BE_QUEUED(e->e_sendmode) || -+ if (UseMSP || WILL_BE_QUEUED(e->e_sendmode) || - (!bitset(EF_SPLIT, e->e_flags) && e->e_ntries == 0 && - FastSplit > 0)) - sortfn = sorthost; diff --git a/mail/sendmail812/files/patch-sfsasl.c b/mail/sendmail812/files/patch-sfsasl.c deleted file mode 100644 index 7cd5d0b29c16..000000000000 --- a/mail/sendmail812/files/patch-sfsasl.c +++ /dev/null @@ -1,23 +0,0 @@ ---- sendmail/sfsasl.c 27 Aug 2002 01:35:17 -0000 8.91.2.1 -+++ sendmail/sfsasl.c 12 Sep 2002 21:07:50 -0000 8.91.2.2 -@@ -182,7 +182,7 @@ - int result; - ssize_t len; - # if SASL >= 20000 -- const char *outbuf = NULL; -+ static const char *outbuf = NULL; - # else /* SASL >= 20000 */ - static char *outbuf = NULL; - # endif /* SASL >= 20000 */ -@@ -199,7 +199,11 @@ - ** if necessary. - */ - -+# if SASL >= 20000 -+ while (outlen == 0) -+# else /* SASL >= 20000 */ - while (outbuf == NULL && outlen == 0) -+# endif /* SASL >= 20000 */ - { - len = sm_io_read(so->fp, SM_TIME_DEFAULT, buf, size); - if (len <= 0) diff --git a/mail/sendmail812/files/patch-smrsh.c b/mail/sendmail812/files/patch-smrsh.c deleted file mode 100644 index f838f4111e61..000000000000 --- a/mail/sendmail812/files/patch-smrsh.c +++ /dev/null @@ -1,63 +0,0 @@ -Index: smrsh.c -=================================================================== -RCS file: /cvs/smrsh/smrsh.c,v -retrieving revision 8.58 -diff -u -r8.58 smrsh.c ---- smrsh/smrsh.c 25 May 2002 02:41:31 -0000 8.58 -+++ smrsh/smrsh.c 24 Sep 2002 23:58:16 -0000 -@@ -57,6 +57,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include -@@ -145,6 +147,7 @@ - char *newenv[2]; - char pathbuf[1000]; - char specialbuf[32]; -+ struct stat st; - - #ifndef DEBUG - # ifndef LOG_MAIL -@@ -302,6 +305,38 @@ - (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, - "Trying %s\n", cmdbuf); - #endif /* DEBUG */ -+ if (stat(cmdbuf, &st) < 0) -+ { -+ /* can't stat it */ -+ (void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT, -+ "%s: %s not available for sendmail programs (stat failed)\n", -+ prg, cmd); -+ if (p != NULL) -+ *p = ' '; -+#ifndef DEBUG -+ syslog(LOG_CRIT, "uid %d: attempt to use %s (stat failed)", -+ (int) getuid(), cmd); -+#endif /* ! DEBUG */ -+ exit(EX_UNAVAILABLE); -+ } -+ if (!S_ISREG(st.st_mode) -+#ifdef S_ISLNK -+ && !S_ISLNK(st.st_mode) -+#endif /* S_ISLNK */ -+ ) -+ { -+ /* can't stat it */ -+ (void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT, -+ "%s: %s not available for sendmail programs (not a file)\n", -+ prg, cmd); -+ if (p != NULL) -+ *p = ' '; -+#ifndef DEBUG -+ syslog(LOG_CRIT, "uid %d: attempt to use %s (not a file)", -+ (int) getuid(), cmd); -+#endif /* ! DEBUG */ -+ exit(EX_UNAVAILABLE); -+ } - if (access(cmdbuf, X_OK) < 0) - { - /* oops.... crack attack possiblity */ -- cgit v1.2.3