From: Art Cancro <ajc@citadel.org>
Date: Wed, 8 Mar 2000 04:01:12 +0000 (+0000)
Subject: * citmail reads citadel.config
X-Git-Tag: v7.86~7270
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=8447484ef37a8c604c25564029d714daf7af59b4;p=citadel.git

* citmail reads citadel.config
---

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 7daefb1d8..1555f2e02 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -208,13 +208,8 @@ netproc: netproc.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
 	$(CC) netproc.o config.o ipc_c_tcp.o tools.o \
 	$(LIBOBJS) $(LDFLAGS) -o netproc $(NETLIBS) $(GDBM)
 
-citmail: citmail.o
-	@echo "*"
-	@echo "*                 ###### IMPORTANT ######"
-	@echo "* To allow Citadel users to receive Internet mail, you must"
-	@echo "* set this program to be your local mail delivery agent."
-	@echo "*"
-	$(CC) citmail.o $(LDFLAGS) -o citmail
+citmail: citmail.o config.o
+	$(CC) citmail.o config.o $(LDFLAGS) -o citmail
 
 mailinglist: mailinglist.o config.o internetmail.o
 	$(CC) mailinglist.o config.o internetmail.o $(LDFLAGS) -o mailinglist
diff --git a/citadel/citmail.c b/citadel/citmail.c
index b4c919230..6eab7a773 100644
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -23,12 +23,14 @@
 #include <pwd.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <limits.h>
 #include "citadel.h"
 #include "citadel_decls.h"
 #include "ipc.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
+#include "config.h"
 
 /* #define DEBUG  */	/* uncomment to get protocol traces */
 
@@ -173,6 +175,8 @@ int main(int argc, char **argv) {
 	char fromline[1024];
 	FILE *fp;
 
+	get_config();
+
 	fp = tmpfile();
 	if (fp == NULL) return(errno);
 	sprintf(fromline, "From: someone@somewhere.org");