Mercurial > hg > mlmmj
changeset 423:ec509ab83a4c
Removed discardedname var since we don't need it anymore
author | mmj |
---|---|
date | Sat, 15 Jan 2005 21:53:52 +1100 |
parents | 6952423ca1dd |
children | 7e6f6cf94701 |
files | ChangeLog VERSION include/mlmmj.h src/log_oper.c src/mlmmj-maintd.c src/mlmmj-recieve.c |
diffstat | 6 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 15 21:46:24 2005 +1100 +++ b/ChangeLog Sat Jan 15 21:53:52 2005 +1100 @@ -1,3 +1,4 @@ + o Add Message-Id: and Date: headers to mail from mlmmj o Make log_oper() varargs capable, thanks Rob Holland 1.1.1-RC1 o Never discard anything from LISTDIR/queue/, let the admin be able to judge
--- a/VERSION Sat Jan 15 21:46:24 2005 +1100 +++ b/VERSION Sat Jan 15 21:53:52 2005 +1100 @@ -1,1 +1,1 @@ -1.1.1-RC1 +1.1.1-RC2
--- a/include/mlmmj.h Sat Jan 15 21:46:24 2005 +1100 +++ b/include/mlmmj.h Sat Jan 15 21:53:52 2005 +1100 @@ -54,6 +54,9 @@ #define DIGESTMIMETYPE "digest" /* Which sub-type of multipart to use when * sending digest mails */ #define OPLOGFNAME "mlmmj.operation.log" /* logfile to log operations */ +#define OPLOGSIZE 524288 + +#define MAXVERPRECIPS 100 struct strlist { int count;
--- a/src/log_oper.c Sat Jan 15 21:46:24 2005 +1100 +++ b/src/log_oper.c Sat Jan 15 21:53:52 2005 +1100 @@ -54,14 +54,9 @@ log_error(LOG_ARGS, "Could not stat logfile %s", logfilename); myfree(logfilename); return -1; - } else if((st.st_mode & S_IFMT) == S_IFLNK) { - log_error(LOG_ARGS, "%s is a symbolic link, not opening", - logfilename); - myfree(logfilename); - return -1; } - if(st.st_size > (off_t)524288) { + if(st.st_size > (off_t)OPLOGSIZE) { tmp = concatstr(2, logfilename, ".rotated"); if(rename(logfilename, tmp) < 0) { log_error(LOG_ARGS, "Could not rename %s,%s",
--- a/src/mlmmj-maintd.c Sat Jan 15 21:46:24 2005 +1100 +++ b/src/mlmmj-maintd.c Sat Jan 15 21:53:52 2005 +1100 @@ -208,8 +208,7 @@ DIR *queuedir; struct dirent *dp; char *mailname, *fromname, *toname, *reptoname, *from, *to, *repto; - char *discardedname = NULL, *ch; - char *dirname = concatstr(2, listdir, "/queue/"); + char *ch, *dirname = concatstr(2, listdir, "/queue/"); pid_t childpid, pid; struct stat st; int fromfd, tofd, fd, discarded = 0, status;
--- a/src/mlmmj-recieve.c Sat Jan 15 21:46:24 2005 +1100 +++ b/src/mlmmj-recieve.c Sat Jan 15 21:53:52 2005 +1100 @@ -56,7 +56,7 @@ { char *infilename = NULL, *listdir = NULL; char *randomstr = random_str(); - char *mlmmjprocess, *bindir, *logstr; + char *mlmmjprocess, *bindir; int fd, opt, noprocess = 0, nofork = 0; struct stat st; uid_t uid; @@ -139,6 +139,8 @@ exit(EXIT_FAILURE); } + log_oper(listdir, OPLOGFNAME, "mlmmj-recieve got %s", infilename); + fsync(fd); close(fd);