Mercurial > hg > mlmmj

changeset 366:7d6c9bb6168f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Warning fixes and release prep
author mmj
date Fri, 12 Nov 2004 12:28:32 +1100
parents 24a86824b6b8
children a5738a509ecc
files README configure.ac include/mlmmj.h src/Makefile.am src/init_sockfd.c src/mlmmj-maintd.c src/mlmmj-send.c src/mlmmj-sub.c src/mlmmj-unsub.c src/prepstdreply.c
diffstat 10 files changed, 25 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/README	Fri Nov 12 10:27:07 2004 +1100
+++ b/README	Fri Nov 12 12:28:32 2004 +1100
@@ -1,4 +1,4 @@
-README mlmmj-1.0.0					Sep 9th 2004
+README mlmmj-1.1.0-RC1					November 12th 2004
 
 This is an attempt at implementing a mailing list manager with the same
 functionality as the brilliant ezmlm, but with a decent license and mail server
@@ -56,6 +56,8 @@
     /var/spool/mlmmj/mlmmj-test/control
     /var/spool/mlmmj/mlmmj-test/moderation
     /var/spool/mlmmj/mlmmj-test/subscribers.d
+    /var/spool/mlmmj/mlmmj-test/digesters.d
+    /var/spool/mlmmj/mlmmj-test/nomailsubs.d
     /var/spool/mlmmj/mlmmj-test/requeue
 
     NOTE: The mailinglist directory (/var/spool/mlmmj/mlmmj-test in our
@@ -79,7 +81,8 @@
     the listdir (/var/spool/mlmmj/mlmmj-test), and log it's last maintenance
     run to listdir/mlmmj-maintd.lastrun.log.
 
-    You need one entry for each list or a wrapper script added once in crontab.
+    If you have several lists below /var/spool/mlmmj you can use -d:
+    /usr/bin/mlmmj-maintd -F -d /var/spool/mlmmj
 
 That's it! You probably want to go through the next steps too.
 
--- a/configure.ac	Fri Nov 12 10:27:07 2004 +1100
+++ b/configure.ac	Fri Nov 12 12:28:32 2004 +1100
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(mlmmj, esyscmd([tr -d '\n' < VERSION]), mmj@mmj.dk)
 
-VERSION=$(cat VERSION)
+VERSION=$PACKAGE_VERSION
 AC_SUBST(VERSION)
 
 AM_INIT_AUTOMAKE(mlmmj, $VERSION)
--- a/include/mlmmj.h	Fri Nov 12 10:27:07 2004 +1100
+++ b/include/mlmmj.h	Fri Nov 12 12:28:32 2004 +1100
@@ -92,7 +92,10 @@
 #define malloc	Bad_programmer__no_biscuit
 #define realloc	Bad_programmer__no_biscuit
 #define free	Bad_programmer__no_biscuit
+#ifdef strdup
+#undef strdup
 #define strdup	Bad_programmer__no_biscuit
+#endif
 #endif  /* _MEMORY_C */
 
 #endif /* MLMMJ_GENERIC_INCLUDES */
--- a/src/Makefile.am	Fri Nov 12 10:27:07 2004 +1100
+++ b/src/Makefile.am	Fri Nov 12 12:28:32 2004 +1100
@@ -2,8 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-CFLAGS = -g -Wall -pedantic -Wsign-compare
-INCLUDES = -I../include
+AM_CFLAGS = -g -Wall -pedantic -Wsign-compare
+INCLUDES = -I$(srcdir)/../include
 
 bin_PROGRAMS = mlmmj-send mlmmj-recieve mlmmj-process mlmmj-sub \
                mlmmj-unsub mlmmj-bounce mlmmj-maintd
--- a/src/init_sockfd.c	Fri Nov 12 10:27:07 2004 +1100
+++ b/src/init_sockfd.c	Fri Nov 12 12:28:32 2004 +1100
@@ -36,7 +36,7 @@
 {
 	int len;
 	struct sockaddr_in addr;
-	uint16_t port = 25;
+	u_short port = 25;
 
 	if (getenv("MLMMJ_TESTING")) {
 		relayhost = "127.0.0.1";
--- a/src/mlmmj-maintd.c	Fri Nov 12 10:27:07 2004 +1100
+++ b/src/mlmmj-maintd.c	Fri Nov 12 12:28:32 2004 +1100
@@ -973,7 +973,7 @@
 
 int main(int argc, char **argv)
 {
-	int opt, daemonize = 1, ret;
+	int opt, daemonize = 1, ret = 0;
 	char *bindir, *listdir = NULL, *mlmmjsend, *mlmmjbounce, *mlmmjunsub;
 	char *dirlists = NULL, *s, *listiter;
 	struct stat st;
--- a/src/mlmmj-send.c	Fri Nov 12 10:27:07 2004 +1100
+++ b/src/mlmmj-send.c	Fri Nov 12 12:28:32 2004 +1100
@@ -470,10 +470,10 @@
 int main(int argc, char **argv)
 {
 	size_t len = 0, hdrslen, bodylen;
-	int sockfd = 0, mailfd = 0, opt, mindex, subfd, tmpfd;
+	int sockfd = 0, mailfd = 0, opt, mindex, subfd = 0, tmpfd;
 	int deletewhensent = 1, sendres, archive = 1, digest = 0;
 	int ctrlarchive;
-	char *listaddr, *mailfilename = NULL, *subfilename = NULL;
+	char *listaddr = NULL, *mailfilename = NULL, *subfilename = NULL;
 	char *replyto = NULL, *bounceaddr = NULL, *to_addr = NULL;
 	char *relayhost = NULL, *archivefilename = NULL, *tmpstr;
 	char *listctrl = NULL, *subddirname = NULL, *listdir = NULL;
--- a/src/mlmmj-sub.c	Fri Nov 12 10:27:07 2004 +1100
+++ b/src/mlmmj-sub.c	Fri Nov 12 12:28:32 2004 +1100
@@ -61,6 +61,7 @@
 	myfree(listfqdn);
 
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			listtext = mystrdup("sub-ok");
 			break;
@@ -106,6 +107,7 @@
 	myfree(listfqdn);
 
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			listtext = mystrdup("notifysub");
 			break;
@@ -179,6 +181,7 @@
 				"@", listfqdn);
 	
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			listtext = mystrdup("sub-confirm");
 			tmpstr = mystrdup("+confsub-");
@@ -347,6 +350,7 @@
 	chstr[1] = '\0';
 	
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			subdir = mystrdup("/subscribers.d/");
 			break;
--- a/src/mlmmj-unsub.c	Fri Nov 12 10:27:07 2004 +1100
+++ b/src/mlmmj-unsub.c	Fri Nov 12 12:28:32 2004 +1100
@@ -61,6 +61,7 @@
 	myfree(listfqdn);
 
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			listtext = mystrdup("unsub-ok");
 			break;
@@ -107,6 +108,7 @@
 	myfree(listfqdn);
 
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			listtext = mystrdup("notifyunsub");
 			break;
@@ -182,6 +184,7 @@
 				"@", listfqdn);
 
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			listtext = mystrdup("unsub-confirm");
 			tmpstr = mystrdup("+confunsub-");
@@ -371,6 +374,7 @@
 	}
 
 	switch(typesub) {
+		default:
 		case SUB_NORMAL:
 			subdir = mystrdup("/subscribers.d/");
 			break;
--- a/src/prepstdreply.c	Fri Nov 12 10:27:07 2004 +1100
+++ b/src/prepstdreply.c	Fri Nov 12 12:28:32 2004 +1100
@@ -150,8 +150,8 @@
 		   char **data)
 {
 	int infd, outfd;
-	char *listaddr, *myfrom, *str, *tmp, *subject, *retstr = NULL;
-	char *myreplyto, *myto;
+	char *listaddr, *myfrom, *tmp, *subject, *retstr = NULL;
+	char *myreplyto, *myto, *str = NULL;
 
 	tmp = concatstr(3, listdir, "/text/", filename);
 	infd = open(tmp, O_RDONLY);