* src, src/mfstat.awk, src/symtab.c, src/lex.l, src/mu_dbm.c,

src/engine.c, src/stack.c, src/snarf.m4, src/dnscache.c,
src/mu_dbm.h, src/opcode.awk, src/gram.y, src/debug.cin,
src/drivers.c, src/bi_poll.m4, src/bi_string.m4, src/mailfromd.h,
src/dnsbase.c, src/debug.hin, src/dns.c, src/openat-die.c,
src/db.c, src/spf.c, src/dns.h, src/drv.awk, src/bi_system.m4,
src/bi_dns.m4, src/spf.h, src/bi_sprintf.m4, src/bi_spf.m4,
src/init.m4, src/debugdef.m4, src/cache.c, src/optab.opc,
src/prog.c, src/optab.oph, src/bi_ipaddr.m4, src/bi_sa.m4,
src/opcodes, src/mf-status.mfi, src/prog.h, src/status.mfi,
src/bi_io.m4, src/pp.c, src/builtin.def, src/bi_sieve.m4,
src/bi_vars.m4, src/main.c, src/Makefile.am, src/bi_other.m4,
src/bi_mail.m4, src/mtasim.c, src/rate.c, src/bi_gettext.m4,
src/bi_db.m4: Move to mfd.
* configure.ac, Makefile.am, mfd/mtasim.c, mfd/Makefile.am: Use
mfd instead of src. 
* mfd: New directory.

* mfd/engine.c (milter_conn_accept): Take a third argument,
specifying the actual length of the sa structure.
Return 0 if mailfromd_acl is not given.
* gacopyz/gacopyz.h, gacopyz/gacopyz.c: xxfi_accept takes third
argument, specifying the actual lengthof the sa structure.

* tests/farg.at, tests/ismx.at, tests/atlocal.in, tests/catch.at,
tests/catch01.at, tests/cond02.at, tests/shadow.at,
tests/version.at, tests/ashadow.at, tests/cond04.at,
tests/relayed02.at, tests/cond06.at, tests/testsuite.at,
tests/ack.at, tests/invcidr.at, tests/switchn1.at,
tests/bctx00.at, tests/switchn3.at, tests/greylist.at,
tests/cidr2.at, tests/fctx00.at, tests/switchs1.at,
tests/switchs3.at, tests/invip2.at, tests/poll02.at,
tests/poll04.at, tests/hostname.at, tests/resolve.at,
tests/invcidr2.at, tests/hasmx.at, tests/declvar.at,
tests/cond01.at, tests/macros.at, tests/invip.at, tests/cond03.at,
tests/relayed01.at, tests/cond05.at, tests/prec.at,
tests/strings.at, tests/rescname.at, tests/bctx01.at,
tests/switchn2.at, tests/cidr1.at, tests/switchn4.at,
tests/cidr3.at, tests/fctx01.at, tests/poll.at, tests/switchs2.at,
tests/poll01.at, tests/ml.at, tests/switchs4.at,
tests/poll03.at: Rename mailfromd to mfd.



git-svn-id: file:///svnroot/mailfromd/branches/gmach@1571 7a8a7f39-df28-0410-adc6-e0d955640f24

112 files changed, 154 insertions, 112 deletions

diff --git a/ChangeLog b/ChangeLog
index 2eeaadd9..0602359b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2008-01-16  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* src, src/mfstat.awk, src/symtab.c, src/lex.l, src/mu_dbm.c,
+	src/engine.c, src/stack.c, src/snarf.m4, src/dnscache.c,
+	src/mu_dbm.h, src/opcode.awk, src/gram.y, src/debug.cin,
+	src/drivers.c, src/bi_poll.m4, src/bi_string.m4, src/mailfromd.h,
+	src/dnsbase.c, src/debug.hin, src/dns.c, src/openat-die.c,
+	src/db.c, src/spf.c, src/dns.h, src/drv.awk, src/bi_system.m4,
+	src/bi_dns.m4, src/spf.h, src/bi_sprintf.m4, src/bi_spf.m4,
+	src/init.m4, src/debugdef.m4, src/cache.c, src/optab.opc,
+	src/prog.c, src/optab.oph, src/bi_ipaddr.m4, src/bi_sa.m4,
+	src/opcodes, src/mf-status.mfi, src/prog.h, src/status.mfi,
+	src/bi_io.m4, src/pp.c, src/builtin.def, src/bi_sieve.m4,
+	src/bi_vars.m4, src/main.c, src/Makefile.am, src/bi_other.m4,
+	src/bi_mail.m4, src/mtasim.c, src/rate.c, src/bi_gettext.m4,
+	src/bi_db.m4: Move to mfd.
+	* configure.ac, Makefile.am, mfd/mtasim.c, mfd/Makefile.am: Use
+	mfd instead of src. 
+	* mfd: New directory.
+	
+	* mfd/engine.c (milter_conn_accept): Take a third argument,
+	specifying the actual length of the sa structure.
+	Return 0 if mailfromd_acl is not given.
+	* gacopyz/gacopyz.h, gacopyz/gacopyz.c: xxfi_accept takes third
+	argument, specifying the actual lengthof the sa structure.
+
+	* tests/farg.at, tests/ismx.at, tests/atlocal.in, tests/catch.at,
+	tests/catch01.at, tests/cond02.at, tests/shadow.at,
+	tests/version.at, tests/ashadow.at, tests/cond04.at,
+	tests/relayed02.at, tests/cond06.at, tests/testsuite.at,
+	tests/ack.at, tests/invcidr.at, tests/switchn1.at,
+	tests/bctx00.at, tests/switchn3.at, tests/greylist.at,
+	tests/cidr2.at, tests/fctx00.at, tests/switchs1.at,
+	tests/switchs3.at, tests/invip2.at, tests/poll02.at,
+	tests/poll04.at, tests/hostname.at, tests/resolve.at,
+	tests/invcidr2.at, tests/hasmx.at, tests/declvar.at,
+	tests/cond01.at, tests/macros.at, tests/invip.at, tests/cond03.at,
+	tests/relayed01.at, tests/cond05.at, tests/prec.at,
+	tests/strings.at, tests/rescname.at, tests/bctx01.at,
+	tests/switchn2.at, tests/cidr1.at, tests/switchn4.at,
+	tests/cidr3.at, tests/fctx01.at, tests/poll.at, tests/switchs2.at,
+	tests/poll01.at, tests/ml.at, tests/switchs4.at,
+	tests/poll03.at: Rename mailfromd to mfd.
+
 2008-01-14  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* src/engine.c, src/mailfromd.h, src/main.c: Implement ACLs.
diff --git a/Makefile.am b/Makefile.am
index 9b4ef660..5c2191d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AUTOMAKE_OPTIONS = gnits 1.8.5 std-options
-SUBDIRS = gnu lib gacopyz src mflib smap pmult pies elisp po etc doc tests
+SUBDIRS = gnu lib gacopyz mfd mflib smap pmult pies elisp po etc doc tests
 ACLOCAL_AMFLAGS = -I m4
 
 distuninstallcheck_listfiles = find . -type f -not -name 'mailfromd.rc' -print
diff --git a/NEWS b/NEWS
index 15c6af61..b6bc2494 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Mailfromd NEWS -- history of user-visible changes. 2008-01-14
+Mailfromd NEWS -- history of user-visible changes. 2008-01-15
 Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
 See the end of file for copying conditions.
 
@@ -57,6 +57,8 @@ implementation will not be compiled.
 
 * Fix compilation on Sun.
 
+* Fix header deletion (delete action).
+
 * Removed depecated features:
 
  1. #pragma option ehlo;
diff --git a/configure.ac b/configure.ac
index 30584080..bd5f6373 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ m4_define([MF_VERSION_PATCH], 91)
 AC_INIT([gmach],
         MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH),
         [bug-gmach@gnu.org.ua])
-AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_SRCDIR([mfd/main.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
@@ -638,7 +638,7 @@ AC_CONFIG_FILES([Makefile
                  gnu/Makefile
 	         lib/Makefile
 	         gacopyz/Makefile
-                 src/Makefile
+                 mfd/Makefile
                  mflib/Makefile
 	         smap/Makefile
                  pmult/Makefile
diff --git a/gacopyz/gacopyz.c b/gacopyz/gacopyz.c
index 98926384..c4d7292e 100644
--- a/gacopyz/gacopyz.c
+++ b/gacopyz/gacopyz.c
@@ -1461,7 +1461,7 @@ gacopyz_handle_connection(gacopyz_conn_t conn)
 	}
 
 	if (conn->desc.xxfi_accept
-	    && conn->desc.xxfi_accept(conn, fd, &addr)) {
+	    && conn->desc.xxfi_accept(conn, fd, &addr, addrlen)) {
 		if (GACOPYZ_CONN_LOG_MATCH(conn, SMI_LOG_DEBUG))
 			gacopyz_log(SMI_LOG_DEBUG,
 				    _("connection refused by xxfi_accept"));
diff --git a/gacopyz/gacopyz.h b/gacopyz/gacopyz.h
index 180b5097..2798914a 100644
--- a/gacopyz/gacopyz.h
+++ b/gacopyz/gacopyz.h
@@ -205,7 +205,8 @@ struct gacopyz_milter_descr
 	int (*xxfi_start) ();  /* Child start callback */
 	int (*xxfi_finish) (); /* Child finish callback */
 	int (*xxfi_idle) (gacopyz_conn_t); /* Idle handler */
-	int (*xxfi_accept) (gacopyz_conn_t, int, const milter_sockaddr_t *);
+	int (*xxfi_accept) (gacopyz_conn_t, int, const milter_sockaddr_t *,
+			    int salen);
 	
 	int logmask;
 	struct timeval ctx_timeout;
dif