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
|
Implement SpamAssassin support.
Honor limits correctly.
Wait for the correct child process - waitpid() instead of wait().
Check for a couple more errors.
Add a closedir() to fix a file descriptor leak.
--- a/vpopmail.c
+++ b/vpopmail.c
@@ -945,6 +945,7 @@
/* print error message and return and error */
fprintf (stderr, "Failed to delete directory %s", mydirent->d_name);
+ closedir(mydir);
return(-1);
}
}
@@ -1562,7 +1563,7 @@
i++;
}
-k = strlen(s) - i - 1;
+k = strlen(s) - i;
if( i>0 ) {
for( j=0; j<k; j++ ) {
@@ -1574,7 +1575,7 @@
// trim spaces and tabs from end
i = strlen(s) - 1;
-while(( s[i] == ' ' ) || ( s[i] == '\t' )) {
+while(i >= 0 && ( s[i] == ' ' || s[i] == '\t' )) {
i--;
}
@@ -2345,7 +2346,12 @@
char calling_dir[MAX_BUFF];
char domain_dir[MAX_BUFF];
const char *dirnames[] = {"Maildir", "Maildir/new", "Maildir/cur",
- "Maildir/tmp"};
+ "Maildir/tmp",
+#ifdef SPAM_JUNKFOLDER
+ "Maildir/.Junk", "Maildir/.Junk/new", "Maildir/.Junk/cur",
+ "Maildir/.Junk/tmp",
+#endif
+ };
int i;
verrori = 0;
@@ -3107,6 +3113,13 @@
if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
+#ifdef SPAM_JUNKFOLDER
+ if (mkdir(".Junk",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
+ if (chdir(".Junk") == -1) { chdir(calling_dir); return(-1); }
+ if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
+ if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
+ if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
+#endif
/* set permissions on the user's dir */
chdir(dir);
@@ -4139,11 +4152,19 @@
}
else if ( pid > 0 )
{
- wait(&rv);
- return(rv);
+ if (waitpid ( pid, &rv, 0 ) < 0 ||
+ !WIFEXITED( rv ) || WEXITSTATUS( rv ) != 0 ) {
+ fprintf(stderr,
+ "ONCHANGE script %s did not exit gracefully.\n",
+ path);
+ return(rv);
+ }
+ return(0);
}
- fprintf(stderr, "ONCHANGE script %s unable to fork.\n", path);
- return(0);
+ rv = errno;
+ fprintf(stderr, "ONCHANGE script %s unable to fork: %s\n", path,
+ strerror(rv));
+ return(rv);
}
#endif
|
