1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
|
*** slocal.c.orig Tue Nov 30 20:01:38 1993
--- uip/slocal.c Tue Apr 23 10:57:56 1996
***************
*** 44,49 ****
--- 44,59 ----
#ifdef MSGID
+ #ifdef BSD44
+ #define MSGID_PAGFILE ".maildelivery.db"
+ #define MSGID_PAGFNO dbm_dirfno
+ #else
+ #define MSGID_PAGFILE ".maildelivery.pag"
+ #define MSGID_PAGFNO dbm_pagfno
+ #endif
+
+ static int check_msgid (int, char *);
+
#undef DBM /* used by ndbm.h */
#include <ndbm.h>
#include <stdio.h>
***************
*** 173,178 ****
--- 183,190 ----
NULL
};
+ static char *rcvstore;
+
/* */
extern char **environ;
***************
*** 299,304 ****
--- 311,318 ----
/* */
+ rcvstore = getcpy(libpath("rcvstore"));
+
if (addr == NULL)
addr = getusr ();
if (user == NULL)
***************
*** 378,387 ****
{
#ifdef MSGID
struct stat st;
! if (stat (".maildelivery.pag", &st) != NOTOK
! && check_msgid (fd, ".maildelivery") == DONE)
! return OK;
#endif
if (usr_delivery (fd, mdlvr ? mdlvr : ".maildelivery", 0, from) != NOTOK)
--- 392,412 ----
{
#ifdef MSGID
struct stat st;
+ static int first = 1;
! if (stat (MSGID_PAGFILE, &st) != NOTOK) {
! /*
! * Allow a user to trigger the database by creating an
! * empty database file. That gets us here, now we need
! * to remove it so DBM will create and initialize it properly.
! */
! if (st.st_size == 0 && first) {
! first = 0;
! (void) unlink(MSGID_PAGFILE);
! }
! if (check_msgid (fd, ".maildelivery") == DONE)
! return OK;
! }
#endif
if (usr_delivery (fd, mdlvr ? mdlvr : ".maildelivery", 0, from) != NOTOK)
***************
*** 543,549 ****
--- 568,590 ----
status = usr_pipe (fd, tmpbuf, "/bin/sh", vec + 2);
break;
+ case '+':
+ dofolder:
+ if (*string == '+')
+ strcpy(tmpbuf, string);
+ else
+ sprintf(tmpbuf, "+%s", string);
+ vec[2] = "rcvstore";
+ vec[3] = tmpbuf;
+ vec[4] = NULL;
+ if (verbose)
+ printf("rcvstore %s", vec[3]);
+ status = usr_pipe(fd, "rcvstore", rcvstore, vec + 2);
+ break;
+
case 'f':
+ if (uleq(action, "folder"))
+ goto dofolder;
if (!uleq (action, "file"))
continue; /* else fall */
case '>':
***************
*** 818,824 ****
if (utmped)
return utmped;
! if ((uf = fopen ("/etc/utmp", "r")) == NULL)
return NOTOK;
while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
--- 859,865 ----
if (utmped)
return utmped;
! if ((uf = fopen (_PATH_UTMP, "r")) == NULL)
return NOTOK;
while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
***************
*** 1314,1332 ****
fl.l_whence = 0;
fl.l_start = 0;
fl.l_len = 0;
! if (fcntl (dbm_pagfno (db), F_SETLK, &fl) == -1) {
advise (file, "unable to perform flock on");
goto out;
}
}
#else
#ifdef LOCKF
! if (lockf (dbm_pagfno (db), F_LOCK) == NOTOK) {
advise (file, "unable to perform lockf on");
goto out;
}
#else
! if (flock (dbm_pagfno (db), LOCK_EX) == NOTOK) {
advise (file, "unable to perform flock on");
goto out;
}
--- 1355,1373 ----
fl.l_whence = 0;
fl.l_start = 0;
fl.l_len = 0;
! if (fcntl (MSGID_PAGFNO (db), F_SETLK, &fl) == -1) {
advise (file, "unable to perform flock on");
goto out;
}
}
#else
#ifdef LOCKF
! if (lockf (MSGID_PAGFNO (db), F_LOCK) == NOTOK) {
advise (file, "unable to perform lockf on");
goto out;
}
#else
! if (flock (MSGID_PAGFNO (db), LOCK_EX) == NOTOK) {
advise (file, "unable to perform flock on");
goto out;
}
*** popauth.c.orig Tue Nov 30 20:01:34 1993
--- support/pop/popauth.c Thu Feb 22 13:00:20 1996
***************
*** 18,23 ****
--- 18,28 ----
#include "../zotnet/bboards.h"
#include "../zotnet/mts.h"
+ #ifdef dbm_pagfno
+ #undef dbm_pagfno
+ #define dbm_pagfno dbm_dirfno
+ #endif
+
/* */
static struct swit switches[] = {
***************
*** 130,137 ****
if ((db = dbm_open (APOP, O_RDWR | O_CREAT, 0600)) == NULL)
adios (APOP, "unable to create POP authorization DB");
if (fchown (dbm_dirfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
! || fchown (dbm_pagfno (db), pw -> pw_uid, pw -> pw_gid)
! == NOTOK)
advise (" ", "error setting ownership of POP authorization DB");
done (0);
--- 135,144 ----
if ((db = dbm_open (APOP, O_RDWR | O_CREAT, 0600)) == NULL)
adios (APOP, "unable to create POP authorization DB");
if (fchown (dbm_dirfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
! #ifndef BSD44
! || fchown (dbm_pagfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
! #endif
! )
advise (" ", "error setting ownership of POP authorization DB");
done (0);
*** popser.c.orig Tue Nov 30 20:01:34 1993
--- support/pop/popser.c Thu Feb 22 12:58:31 1996
***************
*** 666,671 ****
--- 665,674 ----
#include <fcntl.h>
#endif
+ #ifdef dbm_pagfno
+ #undef dbm_pagfno
+ #define dbm_pagfno dbm_dirfno
+ #endif
static int apop (vec)
register char **vec;
--- conf/config/mts.c Mon Sep 22 10:44:37 1997
+++ conf/config/mts.c Mon Sep 22 10:40:14 1997
@@ -13,6 +13,7 @@
#include "../h/strings.h"
#include <ctype.h>
#include <stdio.h>
+#include <paths.h>
#include "mts.h"
#ifdef NETWORK
#if defined(BSD42) || defined(SOCKETS)
@@ -119,7 +120,7 @@
#ifdef SENDMTS
char *hostable = "@(MHETCPATH)/hosts";
-char *sendmail = "/usr/lib/sendmail";
+char *sendmail = _PATH_SENDMAIL;
#endif /* SENDMTS */
--- conf/doc/slocal.rf Tue Nov 30 20:00:20 1993
+++ conf/doc/slocal.rf Mon Sep 22 10:41:16 1997
@@ -294,9 +294,9 @@
.Uh "Duplicate Message Suppression"
\fIslocal\fR is able to detect and supress duplicate messages.
To enable this,
-create two empty files in your $HOME directory:
-\&.maildelivery.pag and \&.maildelivery.dir.
-These are ndbm files which are used to store the Message-IDs of
+create an empty file in your $HOME directory:
+\&.maildelivery.db.
+These is a db files which are used to store the Message-IDs of
incoming messages.
@END: MSGID
.Fi
|
