4 files changed, 10 insertions, 2 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ac132733..ca569203 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 7afa8030..e301eb10 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 bd2ef1fc..231ad00e 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 3d0264c9..b16a554f 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();