]>
Commit | Line | Data |
---|---|---|
45fcf982 | 1 | --- ./amavis/amavis.c.orig Thu Sep 12 19:11:47 2002 |
2 | +++ ./amavis/amavis.c Thu Sep 12 19:43:30 2002 | |
3 | @@ -186,6 +186,7 @@ | |
4 | next_qmail_envelope(char *first, char *last) | |
5 | { | |
6 | static char *p = NULL, *q; | |
7 | + char *tmp; | |
8 | ||
9 | if (!p) { | |
10 | p = first; | |
11 | @@ -196,12 +197,15 @@ | |
12 | /* get args from first */ | |
13 | if (p < q) { | |
14 | if (*p == 'T' || *p == 'F') { | |
15 | - return p+1; | |
16 | + tmp = p+1; | |
17 | + | |
18 | + /* increase p _before_ we return */ | |
19 | + p += strlen(p) + 1; | |
20 | + return tmp; | |
21 | } else { | |
22 | mydebug(DBG_FATAL, "qmail envelope format error (F/T)"); | |
23 | exit(EX_TEMPFAIL); | |
24 | } | |
25 | - p += strlen(p) + 1; | |
26 | } | |
27 | ||
28 | return NULL; | |
29 | --- ./amavis/mta/qmail_init.orig Thu Sep 12 19:11:33 2002 | |
30 | +++ ./amavis/mta/qmail_init Thu Sep 12 19:08:12 2002 | |
31 | @@ -15,6 +15,6 @@ | |
32 | #} | |
33 | ||
34 | # set path explicitly | |
35 | -$ENV{PATH} = "$QMAILDIR:/bin:/usr/bin:/usr/local/bin"; | |
36 | +$ENV{PATH} = "/bin:/usr/bin:/usr/local/bin"; | |
37 | ||
38 | # End qmail |