summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2011-03-09 14:31:14 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-03-09 14:31:14 (GMT)
commit277634ec6dda1a7b7bf35954bfdda28d7df7fdcd (patch) (side-by-side diff)
tree49f9c3e9662bb48ab2a9b69c54cb4b8a613befc9
parent30dfac6b8bc411481c9dd333bd8baab9e15c2d00 (diff)
downloadmailfromd-277634ec6dda1a7b7bf35954bfdda28d7df7fdcd.tar.gz
mailfromd-277634ec6dda1a7b7bf35954bfdda28d7df7fdcd.tar.bz2
Cleanup.
* po/POTFILES.in: Remove appinit.c (See e473ab7d). * src/Makefile.am: Restore incdir, needed for AM_CPPFLAGS. Was accidentally removed in 01ad06fca. * src/builtin/sa.bi (sa): Restore initialization of msize. Accidentally removed in bcd64af9. * src/main.c: Call mf_server_log_setup after compiling the sources, so that --lint spits out its diagnostics on stderr (initially placed here in e75c9a39).
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/builtin/sa.bi6
-rw-r--r--src/main.c3
4 files changed, 10 insertions, 2 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ac13273..ca56920 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,7 +32,6 @@ gacopyz/server.c
gacopyz/smfi.c
# libmf.a
-lib/appinit.c
lib/cache.c
lib/db.c
lib/dbcfg.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7afa803..e301eb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,6 +104,8 @@ BUILT_SOURCES=\
optab.c\
optab.h
+incdir=$(pkgdatadir)/$(VERSION)/include
+
AM_CPPFLAGS=-DSYSCONFDIR=\"$(sysconfdir)\"\
-DDEFAULT_STATE_DIR=\"$(DEFAULT_STATE_DIR)\"\
-DDEFAULT_SOCKET=\"$(DEFAULT_SOCKET)\"\
diff --git a/src/builtin/sa.bi b/src/builtin/sa.bi
index bd2ef1f..231ad00 100644
--- a/src/builtin/sa.bi
+++ b/src/builtin/sa.bi
@@ -329,6 +329,12 @@ MF_DEFUN(sa, NUMBER, STRING urlstr, NUMBER prec, OPTIONAL, NUMBER report)
int report_mode = MF_OPTVAL(report);
int rc;
+ rc = mu_stream_size(mstr, &msize);
+ MF_ASSERT(rc == 0,
+ mfe_failure,
+ "mu_stream_size: %s",
+ mu_strerror (rc));
+
ostr = open_connection(env, urlstr, NULL);
msize += env_get_line_count(env);
diff --git a/src/main.c b/src/main.c
index 3d0264c..b16a554 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1188,7 +1188,6 @@ main(int argc, char **argv)
exit(EX_CONFIG);
flush_arguments(&args);
mf_srvcfg_flush();
- mf_server_log_setup();
alloc_ext_pp();
@@ -1254,6 +1253,8 @@ main(int argc, char **argv)
|| yy_flex_debug || script_ydebug)
exit(EX_OK);
+ mf_server_log_setup();
+
switch (mode) {
case MAILFROMD_DAEMON:
provide_default_milter_server();

Return to:

Send suggestions and report system problems to the System administrator.