* citmail reads citadel.config

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 7daefb1d81139b51f1bb752813172ddb63252001..1555f2e02489fc06bddbf6d5e83828e35f5527ae 100644 (file)
--- 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 b4c919230caa3a0ce2d01cf7ad8e63fd711082b7..6eab7a773a482937c9af6601754a8d7bb0085d44 100644 (file)
--- 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");