summaryrefslogtreecommitdiffabout
Unidiff
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
32gacopyz/smfi.c 32gacopyz/smfi.c
33 33
34# libmf.a 34# libmf.a
35lib/appinit.c
36lib/cache.c 35lib/cache.c
37lib/db.c 36lib/db.c
38lib/dbcfg.c 37lib/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=\
104 optab.c\ 104 optab.c\
105 optab.h 105 optab.h
106 106
107incdir=$(pkgdatadir)/$(VERSION)/include
108
107AM_CPPFLAGS=-DSYSCONFDIR=\"$(sysconfdir)\"\ 109AM_CPPFLAGS=-DSYSCONFDIR=\"$(sysconfdir)\"\
108 -DDEFAULT_STATE_DIR=\"$(DEFAULT_STATE_DIR)\"\ 110 -DDEFAULT_STATE_DIR=\"$(DEFAULT_STATE_DIR)\"\
109 -DDEFAULT_SOCKET=\"$(DEFAULT_SOCKET)\"\ 111 -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)
329 int report_mode = MF_OPTVAL(report); 329 int report_mode = MF_OPTVAL(report);
330 int rc; 330 int rc;
331 331
332 rc = mu_stream_size(mstr, &msize);
333 MF_ASSERT(rc == 0,
334 mfe_failure,
335 "mu_stream_size: %s",
336 mu_strerror (rc));
337
332 ostr = open_connection(env, urlstr, NULL); 338 ostr = open_connection(env, urlstr, NULL);
333 339
334 msize += env_get_line_count(env); 340 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)
1188 exit(EX_CONFIG); 1188 exit(EX_CONFIG);
1189 flush_arguments(&args); 1189 flush_arguments(&args);
1190 mf_srvcfg_flush(); 1190 mf_srvcfg_flush();
1191 mf_server_log_setup();
1192 1191
1193 alloc_ext_pp(); 1192 alloc_ext_pp();
1194 1193
@@ -1254,6 +1253,8 @@ main(int argc, char **argv)
1254 || yy_flex_debug || script_ydebug) 1253 || yy_flex_debug || script_ydebug)
1255 exit(EX_OK); 1254 exit(EX_OK);
1256 1255
1256 mf_server_log_setup();
1257
1257 switch (mode) { 1258 switch (mode) {
1258 case MAILFROMD_DAEMON: 1259 case MAILFROMD_DAEMON:
1259 provide_default_milter_server(); 1260 provide_default_milter_server();

Return to:

Send suggestions and report system problems to the System administrator.