aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2011-03-09 16:31:14 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2011-03-09 16:31:14 +0200
commit277634ec6dda1a7b7bf35954bfdda28d7df7fdcd (patch)
tree49f9c3e9662bb48ab2a9b69c54cb4b8a613befc9 /src
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 (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/builtin/sa.bi6
-rw-r--r--src/main.c3
3 files changed, 10 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7afa8030..e301eb10 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,12 +101,14 @@ BUILT_SOURCES=\
101 mfd-dbgmod.h\ 101 mfd-dbgmod.h\
102 node-tab.c\ 102 node-tab.c\
103 node-type.h\ 103 node-type.h\
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)\"\
110 -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\ 112 -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\
111 -DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\ 113 -DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\
112 -DDEFAULT_PREPROCESSOR="\"$(DEFAULT_PREPROCESSOR)\""\ 114 -DDEFAULT_PREPROCESSOR="\"$(DEFAULT_PREPROCESSOR)\""\
diff --git a/src/builtin/sa.bi b/src/builtin/sa.bi
index bd2ef1fc..231ad00e 100644
--- a/src/builtin/sa.bi
+++ b/src/builtin/sa.bi
@@ -326,12 +326,18 @@ MF_DEFUN(sa, NUMBER, STRING urlstr, NUMBER prec, OPTIONAL, NUMBER report)
326 long version; 326 long version;
327 int result; 327 int result;
328 long score, threshold; 328 long score, threshold;
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);
335 mu_stream_printf(ostr, 341 mu_stream_printf(ostr,
336 report_mode ? "REPORT SPAMC/1.2\n" 342 report_mode ? "REPORT SPAMC/1.2\n"
337 : "SYMBOLS SPAMC/1.2\n"); 343 : "SYMBOLS SPAMC/1.2\n");
diff --git a/src/main.c b/src/main.c
index 3d0264c9..b16a554f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1185,13 +1185,12 @@ main(int argc, char **argv)
1185 rc = mu_app_init(&argp, capa, mf_cfg_param, argc, argv, 1185 rc = mu_app_init(&argp, capa, mf_cfg_param, argc, argv,
1186 argpflag(argc, argv), &index, &args); 1186 argpflag(argc, argv), &index, &args);
1187 if (rc) 1187 if (rc)
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
1195 argv += index; 1194 argv += index;
1196 argc -= index; 1195 argc -= index;
1197 1196
@@ -1251,12 +1250,14 @@ main(int argc, char **argv)
1251 1250
1252 if (script_check || script_dump_macros 1251 if (script_check || script_dump_macros
1253 || script_dump_code || script_dump_tree || script_dump_xref 1252 || script_dump_code || script_dump_tree || script_dump_xref
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();
1260 provide_default_callout_server(); 1261 provide_default_callout_server();
1261 break; 1262 break;
1262 1263

Return to:

Send suggestions and report system problems to the System administrator.