You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
249 lines
6.9 KiB
249 lines
6.9 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../qmail/hotfixes.patch |
|
# Copyright (C) 2004 - 2006 The T2 SDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
--- qmail-1.03/Makefile Mon Jun 15 06:53:16 1998 |
|
+++ netqmail-1.05/Makefile Wed Jan 21 12:58:12 2004 |
|
@@ -263,7 +263,7 @@ |
|
cdbmake_add.o |
|
|
|
cdbmake_add.o: \ |
|
-compile cdbmake_add.c cdbmake.h uint32.h |
|
+compile cdbmake_add.c cdbmake.h alloc.h uint32.h |
|
./compile cdbmake_add.c |
|
|
|
cdbmake_hash.o: \ |
|
@@ -1892,7 +1892,7 @@ |
|
|
|
spawn.o: \ |
|
compile chkspawn spawn.c sig.h wait.h substdio.h byte.h str.h \ |
|
-stralloc.h gen_alloc.h select.h exit.h coe.h open.h error.h \ |
|
+stralloc.h gen_alloc.h select.h exit.h alloc.h coe.h open.h error.h \ |
|
auto_qmail.h auto_uids.h auto_spawn.h |
|
./chkspawn |
|
./compile spawn.c |
|
--- qmail-1.03/cdbmake_add.c Mon Jun 15 06:53:16 1998 |
|
+++ netqmail-1.05/cdbmake_add.c Wed Jan 21 12:58:12 2004 |
|
@@ -1,3 +1,4 @@ |
|
+#include "alloc.h" |
|
#include "cdbmake.h" |
|
|
|
void cdbmake_init(cdbm) |
|
--- qmail-1.03/qmail-local.c Mon Jun 15 06:53:16 1998 |
|
+++ netqmail-1.05/qmail-local.c Wed Jan 21 12:58:12 2004 |
|
@@ -645,7 +645,7 @@ |
|
{ |
|
cmds.s[j] = 0; |
|
k = j; |
|
- while ((k > i) && (cmds.s[k - 1] == ' ') || (cmds.s[k - 1] == '\t')) |
|
+ while ((k > i) && ((cmds.s[k - 1] == ' ') || (cmds.s[k - 1] == '\t'))) |
|
cmds.s[--k] = 0; |
|
switch(cmds.s[i]) |
|
{ |
|
--- qmail-1.03/qmail-pop3d.c Mon Jun 15 06:53:16 1998 |
|
+++ netqmail-1.05/qmail-pop3d.c Wed Jan 21 12:58:12 2004 |
|
@@ -66,14 +66,14 @@ |
|
void die_scan() { err("unable to scan $HOME/Maildir"); die(); } |
|
|
|
void err_syntax() { err("syntax error"); } |
|
-void err_unimpl() { err("unimplemented"); } |
|
+void err_unimpl(arg) char *arg; { err("unimplemented"); } |
|
void err_deleted() { err("already deleted"); } |
|
void err_nozero() { err("messages are counted from 1"); } |
|
void err_toobig() { err("not that many messages"); } |
|
void err_nosuch() { err("unable to open that message"); } |
|
void err_nounlink() { err("unable to unlink all deleted messages"); } |
|
|
|
-void okay() { puts("+OK \r\n"); flush(); } |
|
+void okay(arg) char *arg; { puts("+OK \r\n"); flush(); } |
|
|
|
void printfn(fn) char *fn; |
|
{ |
|
@@ -146,7 +146,7 @@ |
|
} |
|
} |
|
|
|
-void pop3_stat() |
|
+void pop3_stat(arg) char *arg; |
|
{ |
|
int i; |
|
unsigned long total; |
|
@@ -161,15 +161,15 @@ |
|
flush(); |
|
} |
|
|
|
-void pop3_rset() |
|
+void pop3_rset(arg) char *arg; |
|
{ |
|
int i; |
|
for (i = 0;i < numm;++i) m[i].flagdeleted = 0; |
|
last = 0; |
|
- okay(); |
|
+ okay(0); |
|
} |
|
|
|
-void pop3_last() |
|
+void pop3_last(arg) char *arg; |
|
{ |
|
puts("+OK "); |
|
put(strnum,fmt_uint(strnum,last)); |
|
@@ -177,7 +177,7 @@ |
|
flush(); |
|
} |
|
|
|
-void pop3_quit() |
|
+void pop3_quit(arg) char *arg; |
|
{ |
|
int i; |
|
for (i = 0;i < numm;++i) |
|
@@ -192,7 +192,7 @@ |
|
if (!stralloc_0(&line)) die_nomem(); |
|
rename(m[i].fn,line.s); /* if it fails, bummer */ |
|
} |
|
- okay(); |
|
+ okay(0); |
|
die(); |
|
} |
|
|
|
@@ -214,7 +214,7 @@ |
|
if (i == -1) return; |
|
m[i].flagdeleted = 1; |
|
if (i + 1 > last) last = i + 1; |
|
- okay(); |
|
+ okay(0); |
|
} |
|
|
|
void list(i,flaguidl) |
|
@@ -238,7 +238,7 @@ |
|
list(i,flaguidl); |
|
} |
|
else { |
|
- okay(); |
|
+ okay(0); |
|
for (i = 0;i < numm;++i) |
|
if (!m[i].flagdeleted) |
|
list(i,flaguidl); |
|
@@ -267,7 +267,7 @@ |
|
|
|
fd = open_read(m[i].fn); |
|
if (fd == -1) { err_nosuch(); return; } |
|
- okay(); |
|
+ okay(0); |
|
substdio_fdbuf(&ssmsg,read,fd,ssmsgbuf,sizeof(ssmsgbuf)); |
|
blast(&ssmsg,limit); |
|
close(fd); |
|
@@ -299,7 +299,7 @@ |
|
|
|
getlist(); |
|
|
|
- okay(); |
|
+ okay(0); |
|
commands(&ssin,pop3commands); |
|
die(); |
|
} |
|
--- qmail-1.03/qmail-popup.c Mon Jun 15 06:53:16 1998 |
|
+++ netqmail-1.05/qmail-popup.c Wed Jan 21 12:58:12 2004 |
|
@@ -64,10 +64,10 @@ |
|
|
|
void err_syntax() { err("syntax error"); } |
|
void err_wantuser() { err("USER first"); } |
|
-void err_authoriz() { err("authorization first"); } |
|
+void err_authoriz(arg) char *arg; { err("authorization first"); } |
|
|
|
-void okay() { puts("+OK \r\n"); flush(); } |
|
-void pop3_quit() { okay(); die(); } |
|
+void okay(arg) char *arg; { puts("+OK \r\n"); flush(); } |
|
+void pop3_quit(arg) char *arg; { okay(0); die(); } |
|
|
|
|
|
char unique[FMT_ULONG + FMT_ULONG + 3]; |
|
@@ -136,7 +136,7 @@ |
|
void pop3_user(arg) char *arg; |
|
{ |
|
if (!*arg) { err_syntax(); return; } |
|
- okay(); |
|
+ okay(0); |
|
seenuser = 1; |
|
if (!stralloc_copys(&username,arg)) die_nomem(); |
|
if (!stralloc_0(&username)) die_nomem(); |
|
--- qmail-1.03/qmail-smtpd.c Mon Jun 15 06:53:16 1998 |
|
+++ netqmail-1.05/qmail-smtpd.c Wed Jan 21 12:58:12 2004 |
|
@@ -51,12 +51,12 @@ |
|
|
|
void err_bmf() { out("553 sorry, your envelope sender is in my badmailfrom list (#5.7.1)\r\n"); } |
|
void err_nogateway() { out("553 sorry, that domain isn't in my list of allowed rcpthosts (#5.7.1)\r\n"); } |
|
-void err_unimpl() { out("502 unimplemented (#5.5.1)\r\n"); } |
|
+void err_unimpl(arg) char *arg; { out("502 unimplemented (#5.5.1)\r\n"); } |
|
void err_syntax() { out("555 syntax error (#5.5.4)\r\n"); } |
|
void err_wantmail() { out("503 MAIL first (#5.5.1)\r\n"); } |
|
void err_wantrcpt() { out("503 RCPT first (#5.5.1)\r\n"); } |
|
-void err_noop() { out("250 ok\r\n"); } |
|
-void err_vrfy() { out("252 send some mail, i'll try my best\r\n"); } |
|
+void err_noop(arg) char *arg; { out("250 ok\r\n"); } |
|
+void err_vrfy(arg) char *arg; { out("252 send some mail, i'll try my best\r\n"); } |
|
void err_qqt() { out("451 qqt failure (#4.3.0)\r\n"); } |
|
|
|
|
|
@@ -67,11 +67,11 @@ |
|
substdio_puts(&ssout,code); |
|
substdio_put(&ssout,greeting.s,greeting.len); |
|
} |
|
-void smtp_help() |
|
+void smtp_help(arg) char *arg; |
|
{ |
|
out("214 qmail home page: http://pobox.com/~djb/qmail.html\r\n"); |
|
} |
|
-void smtp_quit() |
|
+void smtp_quit(arg) char *arg; |
|
{ |
|
smtp_greet("221 "); out("\r\n"); flush(); _exit(0); |
|
} |
|
@@ -232,7 +232,7 @@ |
|
smtp_greet("250-"); out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n"); |
|
seenmail = 0; dohelo(arg); |
|
} |
|
-void smtp_rset() |
|
+void smtp_rset(arg) char *arg; |
|
{ |
|
seenmail = 0; |
|
out("250 flushed\r\n"); |
|
@@ -316,8 +316,8 @@ |
|
if (flagmaybex) if (pos == 7) ++*hops; |
|
if (pos < 2) if (ch != "\r\n"[pos]) flagmaybey = 0; |
|
if (flagmaybey) if (pos == 1) flaginheader = 0; |
|
+ ++pos; |
|
} |
|
- ++pos; |
|
if (ch == '\n') { pos = 0; flagmaybex = flagmaybey = flagmaybez = 1; } |
|
} |
|
switch(state) { |
|
@@ -365,7 +365,7 @@ |
|
out("\r\n"); |
|
} |
|
|
|
-void smtp_data() { |
|
+void smtp_data(arg) char *arg; { |
|
int hops; |
|
unsigned long qp; |
|
char *qqx; |
|
--- qmail-1.03/spawn.c Mon Jun 15 06:53:16 1998 |
|
+++ netqmail-1.05/spawn.c Wed Jan 21 12:58:12 2004 |
|
@@ -5,6 +5,7 @@ |
|
#include "substdio.h" |
|
#include "byte.h" |
|
#include "str.h" |
|
+#include "alloc.h" |
|
#include "stralloc.h" |
|
#include "select.h" |
|
#include "exit.h"
|
|
|