]>
Commit | Line | Data |
---|---|---|
a78f9b5e | 1 | diff -ruN snapshot-20001005.orig/Makefile.in snapshot-20001005/Makefile.in |
2 | --- snapshot-20001005.orig/Makefile.in Sun Oct 1 02:42:42 2000 | |
3 | +++ snapshot-20001005/Makefile.in Mon Dec 4 21:33:21 2000 | |
4 | @@ -6,7 +6,7 @@ | |
5 | src/lmtp src/trivial-rewrite src/qmgr src/smtp src/bounce src/pipe \ | |
6 | src/showq src/postalias src/postcat src/postconf src/postdrop \ | |
7 | src/postkick src/postlock src/postlog src/postmap src/postsuper \ | |
8 | - src/nqmgr src/spawn src/flush # src/base64 proto man html | |
9 | + src/nqmgr src/spawn src/flush virtual # src/base64 proto man html | |
10 | ||
11 | default: update | |
12 | ||
13 | diff -ruN snapshot-20001005.orig/src/global/mail_params.h snapshot-20001005/src/global/mail_params.h | |
14 | --- snapshot-20001005.orig/src/global/mail_params.h Thu Oct 5 05:23:06 2000 | |
15 | +++ snapshot-20001005/src/global/mail_params.h Mon Dec 4 21:34:53 2000 | |
16 | @@ -1057,6 +1057,28 @@ | |
17 | ||
18 | extern void mail_params_init(void); | |
19 | ||
20 | +/* | |
21 | + * Tunables for the "virtual" local delivery agent | |
22 | + */ | |
23 | +#define VAR_VIRT_MAILBOX_MAPS "virtual_mailbox_maps" | |
24 | +#define DEF_VIRT_MAILBOX_MAPS "" | |
25 | +extern char *var_mailbox_maps; | |
26 | +#define VAR_VIRT_UID_MAPS "virtual_uid_maps" | |
27 | +#define DEF_VIRT_UID_MAPS "" | |
28 | +extern char *var_uid_maps; | |
29 | +#define VAR_VIRT_GID_MAPS "virtual_gid_maps" | |
30 | +#define DEF_VIRT_GID_MAPS "" | |
31 | +extern char *var_gid_maps; | |
32 | +#define VAR_VIRT_USEDOTLOCK "virtual_usedotlock" | |
33 | +#define DEF_VIRT_USEDOTLOCK 0 | |
34 | +extern bool var_virt_usedotlock; | |
35 | +#define VAR_VIRT_MINUID "virtual_minimum_uid" | |
36 | +#define DEF_VIRT_MINUID 100 | |
37 | +extern int var_virt_minimum_uid; | |
38 | +#define VAR_VIRT_MAILBOX_BASE "virtual_mailbox_base" | |
39 | +#define DEF_VIRT_MAILBOX_BASE "" | |
40 | +extern char *var_virt_mailbox_base; | |
41 | + | |
42 | /* | |
43 | * Content inspection and filtering. | |
44 | */ | |
45 | diff -ruN virtual.orig/mailbox.c virtual/mailbox.c | |
46 | --- virtual.orig/mailbox.c Sun Jan 23 12:31:22 2000 | |
47 | +++ snapshot-20001005/virtual/mailbox.c Mon Dec 4 21:48:03 2000 | |
48 | @@ -135,7 +135,7 @@ | |
49 | if (deliver_flock(vstream_fileno(dst), why) < 0) | |
50 | vstream_fclose(dst); | |
51 | else if (mail_copy(COPY_ATTR(state.msg_attr), dst, | |
52 | - copy_flags, why) == 0) { | |
53 | + copy_flags, "\n", why) == 0) { | |
54 | status = 0; | |
55 | } | |
56 | } | |
57 | diff -ruN virtual.orig/maildir.c virtual/maildir.c | |
58 | --- virtual.orig/maildir.c Sun Jan 23 12:31:23 2000 | |
59 | +++ snapshot-20001005/virtual/maildir.c Mon Dec 4 21:49:33 2000 | |
60 | @@ -130,7 +130,7 @@ | |
61 | || (dst = vstream_fopen(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600)) == 0)) { | |
62 | vstring_sprintf(why, "create %s: %m", tmpfile); | |
63 | } else { | |
64 | - if (mail_copy(COPY_ATTR(state.msg_attr), dst, copy_flags, why) == 0) { | |
65 | + if (mail_copy(COPY_ATTR(state.msg_attr), dst, copy_flags, "\n", why) == 0) { | |
66 | if (link(tmpfile, newfile) < 0 | |
67 | && (errno != ENOENT | |
68 | || (make_dirs(curdir, 0700), make_dirs(newdir, 0700)) < 0 |