Merge lp:~ubuntu-branches/ubuntu/lucid/dovecot/lucid-201002122358 into lp:ubuntu/lucid/dovecot

[James Westby]

[James Westby (james-w)]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/dovecot now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/dovecot/lucid-201002122358. A merge should be performed if necessary.

Unmerged revisions

62. By Chuck Short on 2010-01-22

Fix FTBFS.

61. By Chuck Short on 2010-01-21

* Merge from debian testing, remaining changes:
  + Add new binary pkg dovecot-postfix that integrates postfix and dovecot
    automatically: (LP: #164837)
  + debian/control:
    - add new binary with short description
    - set Architecture all for dovecot-postfix (LP: #329878)
  + debian/dovecot-postfix.postinst:
    - create initial certificate symlinks to snakeoil.
    - set up postfix with postconf to:
      - use Maildir/ as the default mailbox.
      - use dovecot as the sasl authentication server.
      - use dovecot LDA (deliver).
      - use tls for smtp{d} services.
    - fix certificates paths in postfix' main.cf
    - add reject_unauth_destination to postfix' recipient restrictions
    - add reject_unknown_sender_domain to postfix' sender restriction
    - rename configuration name on remove, delete on purge
    - restart dovecot after linking certificates
    - handle use case when postfix is unconfigurated
  + debian/dovecot-postfix.dirs: create backup directory for postfix's config
    configuration
  + restart postfix and dovecot.
  + debian/dovecot-postfix.postrm:
    - remove all dovecot related configuration from postfix.
    - restart postfix and dovecot.
  + debian/dovecot-common.init:
    - check if /etc/dovecot/dovecot-postfix.conf exists and use it
      as the configuration file if so.
  + debian/patches/warning-ubuntu-postfix.dpatch
    - add warning about dovecot-postfix.conf in dovecot default
      configuration file
  + debian/patches/dovecot-postfix.conf.diff:
    - Ubuntu server custom changes to the default dovecot configuration for
      better interfation with postfix.
    - enable sieve plugin.
    - Ubuntu server custom changes to the default dovecot configuration for
      better integration with postfix:
      - enable imap, pop3, imaps, pop3s and managesieve by default.
      - enable dovecot LDA (deliver).
      - enable SASL auth socket in postfix private directory
   + debian/rules:
     - copy, patch and install dovecot-postfix.conf in /etc/dovecot/.
     - build architecure independent packages too
   + Use Snakeoil SSL certificates by default.
     - debian/control: Depend on ssl-cert.
     - debian/patches/ssl-cert-snakeoil.dpatch: Change default SSL cert
       paths to snakeoil.
     - debian/dovecot-common.postinst: Relax grep for SSL_* a bit.
   + Add autopkgtest to debian/tests/*.
   + Fast TearDown: Update the lsb init header to not stop in level 6.
   + Add ufw integration:
     - Created debian/dovecot-common.ufw.profile.
     - debian/rules: install profile.
     - debian/control: suggest ufw.
   + debian/{control,rules}: enable PIE hardening.
   + dovecot-imapd, dovecot-pop3: Replaces dovecot-common (<< 1:1.1). (LP: #254721)
   + debian/control: Update Vcs-* headers.
   + Add SMTP-AUTH support for Outlook (login auth mechanism)
* New upstream release.
* debian/patches/gold-fix.patch: Removed. Fixed upstream.
* Moved libexec to lib corrections in dovecot-managesieve.patch and
  dovecot-managesieve-dist.patch to dovecot-example.patch
* debian/patches/dovecot-mboxlocking.patch: Regenerated to avoid FTBFS
  when quilt isn't installed.
* debian/patches/quota-mountpoint.patch: Removed. Not needed anymore.
* debian/patches/dovecot-quota.patch: Removed. Quotas aren't properly
  enabled unless mail_plugins = quota imap_quota.
* debian/patches/gold-fix.patch: Fixed configure script to build even
  with binutils-gold or --no-add-needed linker flag (Closes: #554306)
* debian/dovecot-common.init: fixed LSB headers. Thanks to Pascal Volk.
  (Closes: #558040)
* debian/changelog: added CVE references to previous changelog entry.
* debian/rules: checked up the build system. It's not fragile anymore.
  (Closes: 493803)
* debian/dovecot-common.postinst: Now invoking dpkg-reconfigure
  on dovecot-common is enough to generate new certificates
  if the previous ones were removed. (Closes: #545582)
* debian/rules: No longer install convert-tool in /usr/bin.
  It isn't an user utility and it should stay in /usr/lib/dovecot
  like all other similar tool.
* New upstream release. (Closes: #557601)
* [SECURITY] Fixes local information disclosure and denial of service.
  (see: http://www.dovecot.org/list/dovecot-news/2009-November/000143.html
  and CVE-2009-3897)
* Added myself to uploaders.
* Switched to the new source format "3.0 (quilt)":
  - removed dpatch from build-depends
  - removed debian/README.source because now we use only standard
    dpkg features
  - regenerated all patches
* Prepared to switch to multi-origin source:
  - recreated dovecot-libsieve.patch and dovecot-managesieve-dist.patch
    starting from the upstream tarball
  - removed all autotools related build-depends and build-conflict
  - renamed dovecot-libsieve and dovecot-managesieve directories
    to libsieve and managesieve.
* debian/rules: Moved the configuration of libsieve and managesieve from
  the build phase to the configuration phase
* Added dovecot-dbg package with debugging symbols. Thanks Stephan Bosch.
  (Closes: #554710)
* Fixed some stray libexec'isms in the default configuration.
* New upstream release.
* debian/dovecot-common.init:
  - use $CONF when starting the daemon. (Closes: #549944)
  - always output start/stop messages. (Closes: #523810)

=== modified file 'debian/patches/.dpkg-source-applied'
--- debian/patches/.dpkg-source-applied	2010-01-21 20:02:02 +0000
+++ debian/patches/.dpkg-source-applied	2010-02-13 00:05:29 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 dovecot-libsieve.patch
 dovecot-managesieve-dist.patch
 dovecot-managesieve.patch
@@ -8,3 +9,14 @@
 dovecot-ssl.patch
 dovecot-mboxlocking.patch
 debian-changes-1:1.2.9-1ubuntu2
+=======
+dovecot-libsieve.patch
+dovecot-managesieve-dist.patch
+dovecot-managesieve.patch
+dovecot-example.patch
+dovecot-sql.patch
+dovecot-drac.patch
+exec-check-for-none.patch
+dovecot-ssl.patch
+dovecot-mboxlocking.patch
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-01-21 20:02:02 +0000
+++ debian/patches/series	2010-02-13 00:05:29 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 dovecot-libsieve.patch
 dovecot-managesieve-dist.patch
 dovecot-managesieve.patch
@@ -8,3 +9,14 @@
 dovecot-ssl.patch
 dovecot-mboxlocking.patch
 debian-changes-1:1.2.9-1ubuntu2
+=======
+dovecot-libsieve.patch
+dovecot-managesieve-dist.patch
+dovecot-managesieve.patch
+dovecot-example.patch
+dovecot-sql.patch
+dovecot-drac.patch
+exec-check-for-none.patch
+dovecot-ssl.patch
+dovecot-mboxlocking.patch
+>>>>>>> MERGE-SOURCE

=== added directory 'src/deliver'
=== renamed directory 'src/deliver' => 'src/deliver.moved'
=== added file 'src/deliver/Makefile.am'
--- src/deliver/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/deliver/Makefile.am	2010-02-13 00:05:29 +0000
@@ -0,0 +1,60 @@
+pkglibexecdir = $(libexecdir)/dovecot
+
+pkglibexec_PROGRAMS = deliver
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/lib-auth \
+	-I$(top_srcdir)/src/lib-dict \
+	-I$(top_srcdir)/src/lib-mail \
+	-I$(top_srcdir)/src/lib-imap \
+	-I$(top_srcdir)/src/lib-index \
+	-I$(top_srcdir)/src/lib-settings \
+	-I$(top_srcdir)/src/lib-storage \
+	-I$(top_srcdir)/src/lib-storage/index \
+	-I$(top_srcdir)/src/lib-storage/index/raw \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DPKG_RUNDIR=\""$(rundir)"\" \
+	-DMODULEDIR=\""$(moduledir)"\"
+
+deliver_LDFLAGS = -export-dynamic
+
+# get some functions included which only plugins use. liblib should probably
+# be a shared library so this wouldn't be needed..
+unused_objects = \
+	../lib/mountpoint.o \
+	../lib-mail/message-header-encode.o \
+	../lib-imap/imap-util.o
+
+libs = \
+	$(STORAGE_LIBS) \
+	../lib-dict/libdict.a \
+	$(unused_objects)
+
+deliver_LDADD = \
+	$(libs) \
+	$(LIBICONV) \
+	$(MODULE_LIBS)
+
+deliver_DEPENDENCIES = $(libs)
+
+deliver_SOURCES = \
+	auth-client.c \
+	deliver.c \
+	duplicate.c \
+	mail-send.c \
+	smtp-client.c
+
+headers = \
+	auth-client.h \
+	deliver.h \
+	duplicate.h \
+	mail-send.h \
+	smtp-client.h
+
+if INSTALL_HEADERS
+  pkginc_libdir=$(pkgincludedir)/src/deliver
+  pkginc_lib_HEADERS = $(headers)
+else
+  noinst_HEADERS = $(headers)
+endif

=== added file 'src/deliver/Makefile.in'
--- src/deliver/Makefile.in	1970-01-01 00:00:00 +0000
+++ src/deliver/Makefile.in	2010-02-13 00:05:29 +0000
@@ -0,0 +1,657 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+pkglibexec_PROGRAMS = deliver$(EXEEXT)
+subdir = src/deliver
+DIST_COMMON = $(am__noinst_HEADERS_DIST) \
+	$(am__pkginc_lib_HEADERS_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(pkglibexecdir)" \
+	"$(DESTDIR)$(pkginc_libdir)"
+PROGRAMS = $(pkglibexec_PROGRAMS)
+am_deliver_OBJECTS = auth-client.$(OBJEXT) deliver.$(OBJEXT) \
+	duplicate.$(OBJEXT) mail-send.$(OBJEXT) smtp-client.$(OBJEXT)
+deliver_OBJECTS = $(am_deliver_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) ../lib-dict/libdict.a \
+	$(unused_objects)
+deliver_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(deliver_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(deliver_SOURCES)
+DIST_SOURCES = $(deliver_SOURCES)
+am__noinst_HEADERS_DIST = auth-client.h deliver.h duplicate.h \
+	mail-send.h smtp-client.h
+am__pkginc_lib_HEADERS_DIST = auth-client.h deliver.h duplicate.h \
+	mail-send.h smtp-client.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+HEADERS = $(noinst_HEADERS) $(pkginc_lib_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkglibexecdir = $(libexecdir)/dovecot
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTH_CFLAGS = @AUTH_CFLAGS@
+AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURLCONFIG = @CURLCONFIG@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DICT_LIBS = @DICT_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KRB5CONFIG = @KRB5CONFIG@
+KRB5_CFLAGS = @KRB5_CFLAGS@
+KRB5_LIBS = @KRB5_LIBS@
+LD = @LD@
+LDAP_LIBS = @LDAP_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBCAP = @LIBCAP@
+LIBICONV = @LIBICONV@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MODULE_LIBS = @MODULE_LIBS@
+MODULE_SUFFIX = @MODULE_SUFFIX@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_LIBS = @MYSQL_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+PG_CONFIG = @PG_CONFIG@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RPCGEN = @RPCGEN@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+SQL_CFLAGS = @SQL_CFLAGS@
+SQL_LIBS = @SQL_LIBS@
+SSL_CFLAGS = @SSL_CFLAGS@
+SSL_LIBS = @SSL_LIBS@
+STORAGE_LIBS = @STORAGE_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dict_drivers = @dict_drivers@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mail_storages = @mail_storages@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+rundir = @rundir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sql_drivers = @sql_drivers@
+srcdir = @srcdir@
+ssldir = @ssldir@
+statedir = @statedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/lib-auth \
+	-I$(top_srcdir)/src/lib-dict \
+	-I$(top_srcdir)/src/lib-mail \
+	-I$(top_srcdir)/src/lib-imap \
+	-I$(top_srcdir)/src/lib-index \
+	-I$(top_srcdir)/src/lib-settings \
+	-I$(top_srcdir)/src/lib-storage \
+	-I$(top_srcdir)/src/lib-storage/index \
+	-I$(top_srcdir)/src/lib-storage/index/raw \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DPKG_RUNDIR=\""$(rundir)"\" \
+	-DMODULEDIR=\""$(moduledir)"\"
+
+deliver_LDFLAGS = -export-dynamic
+
+# get some functions included which only plugins use. liblib should probably
+# be a shared library so this wouldn't be needed..
+unused_objects = \
+	../lib/mountpoint.o \
+	../lib-mail/message-header-encode.o \
+	../lib-imap/imap-util.o
+
+libs = \
+	$(STORAGE_LIBS) \
+	../lib-dict/libdict.a \
+	$(unused_objects)
+
+deliver_LDADD = \
+	$(libs) \
+	$(LIBICONV) \
+	$(MODULE_LIBS)
+
+deliver_DEPENDENCIES = $(libs)
+deliver_SOURCES = \
+	auth-client.c \
+	deliver.c \
+	duplicate.c \
+	mail-send.c \
+	smtp-client.c
+
+headers = \
+	auth-client.h \
+	deliver.h \
+	duplicate.h \
+	mail-send.h \
+	smtp-client.h
+
+@INSTALL_HEADERS_TRUE@pkginc_libdir = $(pkgincludedir)/src/deliver
+@INSTALL_HEADERS_TRUE@pkginc_lib_HEADERS = $(headers)
+@INSTALL_HEADERS_FALSE@noinst_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/deliver/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/deliver/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
+	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-pkglibexecPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files
+
+clean-pkglibexecPROGRAMS:
+	@list='$(pkglibexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+deliver$(EXEEXT): $(deliver_OBJECTS) $(deliver_DEPENDENCIES) 
+	@rm -f deliver$(EXEEXT)
+	$(deliver_LINK) $(deliver_OBJECTS) $(deliver_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth-client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deliver.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/duplicate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-send.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp-client.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkginc_libHEADERS: $(pkginc_lib_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkginc_libdir)" || $(MKDIR_P) "$(DESTDIR)$(pkginc_libdir)"
+	@list='$(pkginc_lib_HEADERS)'; test -n "$(pkginc_libdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkginc_libdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkginc_libdir)" || exit $$?; \
+	done
+
+uninstall-pkginc_libHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginc_lib_HEADERS)'; test -n "$(pkginc_libdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkginc_libdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkginc_libdir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(pkginc_libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibexecPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkginc_libHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-pkglibexecPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkginc_libHEADERS uninstall-pkglibexecPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibexecPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkginc_libHEADERS \
+	install-pkglibexecPROGRAMS install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-pkginc_libHEADERS uninstall-pkglibexecPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

=== added file 'src/deliver/auth-client.c'
--- src/deliver/auth-client.c	1970-01-01 00:00:00 +0000
+++ src/deliver/auth-client.c	2010-02-13 00:05:29 +0000
@@ -0,0 +1,153 @@
+/* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "array.h"
+#include "ioloop.h"
+#include "network.h"
+#include "istream.h"
+#include "ostream.h"
+#include "env-util.h"
+#include "restrict-access.h"
+#include "auth-client.h"
+#include "auth-master.h"
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sysexits.h>
+
+static bool parse_uid(const char *str, uid_t *uid_r)
+{
+	struct passwd *pw;
+	char *p;
+
+	if (*str >= '0' && *str <= '9') {
+		*uid_r = (uid_t)strtoul(str, &p, 10);
+		if (*p == '\0')
+			return TRUE;
+	}
+
+	pw = getpwnam(str);
+	if (pw == NULL)
+		return FALSE;
+
+	*uid_r = pw->pw_uid;
+	return TRUE;
+}
+
+static bool parse_gid(const char *str, gid_t *gid_r)
+{
+	struct group *gr;
+	char *p;
+
+	if (*str >= '0' && *str <= '9') {
+		*gid_r = (gid_t)strtoul(str, &p, 10);
+		if (*p == '\0')
+			return TRUE;
+	}
+
+	gr = getgrnam(str);
+	if (gr == NULL)
+		return FALSE;
+
+	*gid_r = gr->gr_gid;
+	return TRUE;
+}
+
+static int set_env(struct auth_user_reply *reply,
+		   const char *user, uid_t euid)
+{
+	const char *extra_groups;
+	unsigned int len;
+
+	if (reply->uid == 0) {
+		i_error("userdb(%s) returned 0 as uid", user);
+		return -1;
+	} else if (reply->uid == (uid_t)-1) {
+		if (getenv("MAIL_UID") != NULL) {
+			if (!parse_uid(getenv("MAIL_UID"), &reply->uid) ||
+			    reply->uid == 0) {
+				i_error("mail_uid setting is invalid");
+				return -1;
+			}
+		} else {
+			i_error("User %s is missing UID (set mail_uid)", user);
+			return -1;
+		}
+	}
+	if (reply->gid == 0) {
+		i_error("userdb(%s) returned 0 as gid", user);
+		return -1;
+	} else if (reply->gid == (gid_t)-1) {
+		if (getenv("MAIL_GID") != NULL) {
+			if (!parse_gid(getenv("MAIL_GID"), &reply->gid) ||
+			    reply->gid == 0) {
+				i_error("mail_gid setting is invalid");
+				return -1;
+			}
+		} else {
+			i_error("User %s is missing GID (set mail_gid)", user);
+			return -1;
+		}
+	}
+
+	if (euid != reply->uid) {
+		env_put(t_strconcat("RESTRICT_SETUID=",
+				    dec2str(reply->uid), NULL));
+	}
+	if (euid == 0 || getegid() != reply->gid) {
+		env_put(t_strconcat("RESTRICT_SETGID=",
+				    dec2str(reply->gid), NULL));
+	}
+
+	if (reply->chroot == NULL)
+		reply->chroot = getenv("MAIL_CHROOT");
+	if (reply->chroot != NULL) {
+		len = strlen(reply->chroot);
+		if (len > 2 && strcmp(reply->chroot + len - 2, "/.") == 0 &&
+		    reply->home != NULL &&
+		    strncmp(reply->home, reply->chroot, len - 2) == 0) {
+			/* strip chroot dir from home dir */
+			reply->home += len - 2;
+		}
+		env_put(t_strconcat("RESTRICT_CHROOT=", reply->chroot, NULL));
+	}
+	if (reply->home != NULL)
+		env_put(t_strconcat("HOME=", reply->home, NULL));
+
+	extra_groups = getenv("MAIL_ACCESS_GROUPS");
+	if (extra_groups != NULL) {
+		env_put(t_strconcat("RESTRICT_SETEXTRAGROUPS=",
+				    extra_groups, NULL));
+	}
+	return 0;
+}
+
+int auth_client_lookup_and_restrict(const char *auth_socket,
+				    const char **user, uid_t euid, pool_t pool,
+				    ARRAY_TYPE(const_string) *extra_fields_r)
+{
+        struct auth_master_connection *conn;
+	struct auth_user_reply reply;
+	bool debug = getenv("DEBUG") != NULL;
+	int ret = EX_TEMPFAIL;
+
+	conn = auth_master_init(auth_socket, debug);
+	switch (auth_master_user_lookup(conn, *user, "deliver", pool, &reply)) {
+	case 0:
+		ret = EX_NOUSER;
+		break;
+	case 1:
+		if (set_env(&reply, *user, euid) == 0) {
+			*user = p_strdup(pool, reply.user);
+			restrict_access_by_env(TRUE);
+			ret = EX_OK;
+		}
+		break;
+	}
+
+	*extra_fields_r = reply.extra_fields;
+	auth_master_deinit(&conn);
+	return ret;
+}

=== removed file 'src/deliver/auth-client.c'
--- src/deliver/auth-client.c	2009-11-06 00:47:29 +0000
+++ src/deliver/auth-client.c	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-/* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "array.h"
-#include "ioloop.h"
-#include "network.h"
-#include "istream.h"
-#include "ostream.h"
-#include "env-util.h"
-#include "restrict-access.h"
-#include "auth-client.h"
-#include "auth-master.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sysexits.h>
-
-static bool parse_uid(const char *str, uid_t *uid_r)
-{
-	struct passwd *pw;
-	char *p;
-
-	if (*str >= '0' && *str <= '9') {
-		*uid_r = (uid_t)strtoul(str, &p, 10);
-		if (*p == '\0')
-			return TRUE;
-	}
-
-	pw = getpwnam(str);
-	if (pw == NULL)
-		return FALSE;
-
-	*uid_r = pw->pw_uid;
-	return TRUE;
-}
-
-static bool parse_gid(const char *str, gid_t *gid_r)
-{
-	struct group *gr;
-	char *p;
-
-	if (*str >= '0' && *str <= '9') {
-		*gid_r = (gid_t)strtoul(str, &p, 10);
-		if (*p == '\0')
-			return TRUE;
-	}
-
-	gr = getgrnam(str);
-	if (gr == NULL)
-		return FALSE;
-
-	*gid_r = gr->gr_gid;
-	return TRUE;
-}
-
-static int set_env(struct auth_user_reply *reply,
-		   const char *user, uid_t euid)
-{
-	const char *extra_groups;
-	unsigned int len;
-
-	if (reply->uid == 0) {
-		i_error("userdb(%s) returned 0 as uid", user);
-		return -1;
-	} else if (reply->uid == (uid_t)-1) {
-		if (getenv("MAIL_UID") != NULL) {
-			if (!parse_uid(getenv("MAIL_UID"), &reply->uid) ||
-			    reply->uid == 0) {
-				i_error("mail_uid setting is invalid");
-				return -1;
-			}
-		} else {
-			i_error("User %s is missing UID (set mail_uid)", user);
-			return -1;
-		}
-	}
-	if (reply->gid == 0) {
-		i_error("userdb(%s) returned 0 as gid", user);
-		return -1;
-	} else if (reply->gid == (gid_t)-1) {
-		if (getenv("MAIL_GID") != NULL) {
-			if (!parse_gid(getenv("MAIL_GID"), &reply->gid) ||
-			    reply->gid == 0) {
-				i_error("mail_gid setting is invalid");
-				return -1;
-			}
-		} else {
-			i_error("User %s is missing GID (set mail_gid)", user);
-			return -1;
-		}
-	}
-
-	if (euid != reply->uid) {
-		env_put(t_strconcat("RESTRICT_SETUID=",
-				    dec2str(reply->uid), NULL));
-	}
-	if (euid == 0 || getegid() != reply->gid) {
-		env_put(t_strconcat("RESTRICT_SETGID=",
-				    dec2str(reply->gid), NULL));
-	}
-
-	if (reply->chroot == NULL)
-		reply->chroot = getenv("MAIL_CHROOT");
-	if (reply->chroot != NULL) {
-		len = strlen(reply->chroot);
-		if (len > 2 && strcmp(reply->chroot + len - 2, "/.") == 0 &&
-		    reply->home != NULL &&
-		    strncmp(reply->home, reply->chroot, len - 2) == 0) {
-			/* strip chroot dir from home dir */
-			reply->home += len - 2;
-		}
-		env_put(t_strconcat("RESTRICT_CHROOT=", reply->chroot, NULL));
-	}
-	if (reply->home != NULL)
-		env_put(t_strconcat("HOME=", reply->home, NULL));
-
-	extra_groups = getenv("MAIL_ACCESS_GROUPS");
-	if (extra_groups != NULL) {
-		env_put(t_strconcat("RESTRICT_SETEXTRAGROUPS=",
-				    extra_groups, NULL));
-	}
-	return 0;
-}
-
-int auth_client_lookup_and_restrict(const char *auth_socket,
-				    const char **user, uid_t euid, pool_t pool,
-				    ARRAY_TYPE(const_string) *extra_fields_r)
-{
-        struct auth_master_connection *conn;
-	struct auth_user_reply reply;
-	bool debug = getenv("DEBUG") != NULL;
-	int ret = EX_TEMPFAIL;
-
-	conn = auth_master_init(auth_socket, debug);
-	switch (auth_master_user_lookup(conn, *user, "deliver", pool, &reply)) {
-	case 0:
-		ret = EX_NOUSER;
-		break;
-	case 1:
-		if (set_env(&reply, *user, euid) == 0) {
-			*user = p_strdup(pool, reply.user);
-			restrict_access_by_env(TRUE);
-			ret = EX_OK;
-		}
-		break;
-	}
-
-	*extra_fields_r = reply.extra_fields;
-	auth_master_deinit(&conn);
-	return ret;
-}

=== added file 'src/deliver/auth-client.h'
--- src/deliver/auth-client.h	1970-01-01 00:00:00 +0000
+++ src/deliver/auth-client.h	2010-02-13 00:05:29 +0000
@@ -0,0 +1,8 @@
+#ifndef AUTH_CLIENT_H
+#define AUTH_CLIENT_H
+
+int auth_client_lookup_and_restrict(const char *auth_socket,
+				    const char **user, uid_t euid, pool_t pool,
+				    ARRAY_TYPE(const_string) *extra_fields_r);
+
+#endif

=== removed file 'src/deliver/auth-client.h'
--- src/deliver/auth-client.h	2009-11-06 00:47:29 +0000
+++ src/deliver/auth-client.h	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#ifndef AUTH_CLIENT_H
-#define AUTH_CLIENT_H
-
-int auth_client_lookup_and_restrict(const char *auth_socket,
-				    const char **user, uid_t euid, pool_t pool,
-				    ARRAY_TYPE(const_string) *extra_fields_r);
-
-#endif

=== added file 'src/deliver/deliver.c'
--- src/deliver/deliver.c	1970-01-01 00:00:00 +0000
+++ src/deliver/deliver.c	2010-02-13 00:05:29 +0000
@@ -0,0 +1,1319 @@
+/* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
+
+/* This is getting pretty horrible. Especially the config file parsing.
+   Dovecot v2.0 should have a config file handling process which should help
+   with this.. */
+
+#include "lib.h"
+#include "lib-signals.h"
+#include "file-lock.h"
+#include "array.h"
+#include "ioloop.h"
+#include "hostpid.h"
+#include "home-expand.h"
+#include "env-util.h"
+#include "fd-set-nonblock.h"
+#include "istream.h"
+#include "istream-seekable.h"
+#include "module-dir.h"
+#include "str.h"
+#include "str-sanitize.h"
+#include "strescape.h"
+#include "safe-mkstemp.h"
+#include "mkdir-parents.h"
+#include "eacces-error.h"
+#include "close-keep-errno.h"
+#include "var-expand.h"
+#include "rfc822-parser.h"
+#include "message-address.h"
+#include "mail-namespace.h"
+#include "raw-storage.h"
+#include "imap-utf7.h"
+#include "dict.h"
+#include "auth-client.h"
+#include "mail-send.h"
+#include "duplicate.h"
+#include "mbox-from.h"
+#include "../master/syslog-util.h"
+#include "../master/syslog-util.c" /* ugly, ugly.. */
+#include "deliver.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <pwd.h>
+#include <syslog.h>
+
+#define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
+#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
+#define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
+
+/* After buffer grows larger than this, create a temporary file to /tmp
+   where to read the mail. */
+#define MAIL_MAX_MEMORY_BUFFER (1024*128)
+
+static const char *wanted_headers[] = {
+	"From", "Message-ID", "Subject", "Return-Path",
+	NULL
+};
+
+struct deliver_settings *deliver_set;
+deliver_mail_func_t *deliver_mail = NULL;
+bool tried_default_save = FALSE;
+
+/* FIXME: these two should be in some context struct instead of as globals.. */
+static const char *default_mailbox_name = NULL;
+static bool saved_mail = FALSE;
+static char *explicit_envelope_sender = NULL;
+
+static struct module *modules;
+static struct ioloop *ioloop;
+
+static pool_t plugin_pool;
+static ARRAY_DEFINE(lda_envs, const char *);
+static ARRAY_DEFINE(plugin_envs, const char *);
+
+static void sig_die(const siginfo_t *si, void *context ATTR_UNUSED)
+{
+	/* warn about being killed because of some signal, except SIGINT (^C)
+	   which is too common at least while testing :) */
+	if (si->si_signo != SIGINT) {
+		i_warning("Killed with signal %d (by pid=%s uid=%s code=%s)",
+			  si->si_signo, dec2str(si->si_pid),
+			  dec2str(si->si_uid),
+			  lib_signal_code_to_str(si->si_signo, si->si_code));
+	}
+	io_loop_stop(current_ioloop);
+}
+
+static const char *deliver_get_address(struct mail *mail, const char *header)
+{
+	struct message_address *addr;
+	const char *str;
+
+	if (mail_get_first_header(mail, header, &str) <= 0)
+		return NULL;
+	addr = message_address_parse(pool_datastack_create(),
+				     (const unsigned char *)str,
+				     strlen(str), 1, FALSE);
+	return addr == NULL || addr->mailbox == NULL || addr->domain == NULL ||
+		*addr->mailbox == '\0' || *addr->domain == '\0' ?
+		NULL : t_strconcat(addr->mailbox, "@", addr->domain, NULL);
+}
+
+static const struct var_expand_table *
+get_log_var_expand_table(struct mail *mail, const char *message)
+{
+	static struct var_expand_table static_tab[] = {
+		{ '$', NULL, NULL },
+		{ 'm', NULL, "msgid" },
+		{ 's', NULL, "subject" },
+		{ 'f', NULL, "from" },
+		{ '\0', NULL, NULL }
+	};
+	struct var_expand_table *tab;
+	unsigned int i;
+
+	tab = t_malloc(sizeof(static_tab));
+	memcpy(tab, static_tab, sizeof(static_tab));
+
+	tab[0].value = message;
+	(void)mail_get_first_header(mail, "Message-ID", &tab[1].value);
+	(void)mail_get_first_header_utf8(mail, "Subject", &tab[2].value);
+	tab[3].value = deliver_get_address(mail, "From");
+	for (i = 1; tab[i].key != '\0'; i++)
+		tab[i].value = str_sanitize(tab[i].value, 80);
+	return tab;
+}
+
+static void
+deliver_log(struct mail *mail, const char *fmt, ...) ATTR_FORMAT(2, 3);
+
+static void deliver_log(struct mail *mail, const char *fmt, ...)
+{
+	va_list args;
+	string_t *str;
+	const char *msg;
+
+	va_start(args, fmt);
+	msg = t_strdup_vprintf(fmt, args);
+
+	str = t_str_new(256);
+	var_expand(str, deliver_set->log_format,
+		   get_log_var_expand_table(mail, msg));
+	i_info("%s", str_c(str));
+	va_end(args);
+}
+
+static struct mailbox *
+mailbox_open_or_create_synced(struct mail_namespace *namespaces,
+			      struct mail_storage **storage_r,
+			      const char *name)
+{
+	struct mail_namespace *ns;
+	struct mailbox *box;
+	enum mail_error error;
+	enum mailbox_open_flags open_flags = MAILBOX_OPEN_FAST |
+		MAILBOX_OPEN_KEEP_RECENT | MAILBOX_OPEN_SAVEONLY |
+		MAILBOX_OPEN_POST_SESSION;
+
+	if (strcasecmp(name, "INBOX") == 0) {
+		/* deliveries to INBOX must always succeed,
+		   regardless of ACLs */
+		open_flags |= MAILBOX_OPEN_IGNORE_ACLS;
+	}
+
+	ns = mail_namespace_find(namespaces, &name);
+	if (ns == NULL) {
+		*storage_r = NULL;
+		return NULL;
+	}
+	*storage_r = ns->storage;
+
+	if (*name == '\0') {
+		/* delivering to a namespace prefix means we actually want to
+		   deliver to the INBOX instead */
+		return NULL;
+	}
+
+	box = mailbox_open(storage_r, name, NULL, open_flags);
+	if (box != NULL || !deliver_set->mailbox_autocreate)
+		return box;
+
+	(void)mail_storage_get_last_error(*storage_r, &error);
+	if (error != MAIL_ERROR_NOTFOUND)
+		return NULL;
+
+	/* try creating it. */
+	if (mail_storage_mailbox_create(*storage_r, name, FALSE) < 0)
+		return NULL;
+	if (deliver_set->mailbox_autosubscribe) {
+		/* (try to) subscribe to it */
+		(void)mailbox_list_set_subscribed(ns->list, name, TRUE);
+	}
+
+	/* and try opening again */
+	box = mailbox_open(storage_r, name, NULL, open_flags);
+	if (box == NULL)
+		return NULL;
+
+	if (mailbox_sync(box, 0, 0, NULL) < 0) {
+		mailbox_close(&box);
+		return NULL;
+	}
+	return box;
+}
+
+static const char *mailbox_name_get_printable(const char *mailbox_mutf7)
+{
+	string_t *str = t_str_new(128);
+
+	if (imap_utf7_to_utf8(mailbox_mutf7, str) < 0) {
+		str_truncate(str, 0);
+		str_append(str, mailbox_mutf7);
+	}
+	return str_sanitize(str_c(str), 80);
+}
+
+int deliver_save(struct mail_namespace *namespaces,
+		 struct mail_storage **storage_r, const char *mailbox,
+		 struct mail *mail, enum mail_flags flags,
+		 const char *const *keywords)
+{
+	struct mailbox *box;
+	struct mailbox_transaction_context *t;
+	struct mail_save_context *save_ctx;
+	struct mail_keywords *kw;
+	enum mail_error error;
+	const char *mailbox_name;
+	bool default_save;
+	int ret = 0;
+
+	default_save = strcmp(mailbox, default_mailbox_name) == 0;
+	if (default_save)
+		tried_default_save = TRUE;
+
+	mailbox_name = mailbox_name_get_printable(mailbox);
+	box = mailbox_open_or_create_synced(namespaces, storage_r, mailbox);
+	if (box == NULL) {
+		if (*storage_r == NULL) {
+			deliver_log(mail,
+				    "save failed to %s: Unknown namespace",
+				    mailbox_name);
+			return -1;
+		}
+		if (default_save &&
+		    strcmp((*storage_r)->ns->prefix, mailbox) == 0) {
+			/* silently store to the INBOX instead */
+			return -1;
+		}
+		deliver_log(mail, "save failed to %s: %s", mailbox_name,
+			    mail_storage_get_last_error(*storage_r, &error));
+		return -1;
+	}
+
+	t = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
+
+	kw = str_array_length(keywords) == 0 ? NULL :
+		mailbox_keywords_create_valid(box, keywords);
+	save_ctx = mailbox_save_alloc(t);
+	mailbox_save_set_flags(save_ctx, flags, kw);
+	if (mailbox_copy(&save_ctx, mail) < 0)
+		ret = -1;
+	mailbox_keywords_free(box, &kw);
+
+	if (ret < 0)
+		mailbox_transaction_rollback(&t);
+	else
+		ret = mailbox_transaction_commit(&t);
+
+	if (ret == 0) {
+		saved_mail = TRUE;
+		deliver_log(mail, "saved mail to %s", mailbox_name);
+	} else {
+		deliver_log(mail, "save failed to %s: %s", mailbox_name,
+			    mail_storage_get_last_error(*storage_r, &error));
+	}
+
+	mailbox_close(&box);
+	return ret;
+}
+
+const char *deliver_get_return_address(struct mail *mail)
+{
+	if (explicit_envelope_sender != NULL)
+		return explicit_envelope_sender;
+
+	return deliver_get_address(mail, "Return-Path");
+}
+
+const char *deliver_get_new_message_id(void)
+{
+	static int count = 0;
+
+	return t_strdup_printf("<dovecot-%s-%s-%d@%s>",
+			       dec2str(ioloop_timeval.tv_sec),
+			       dec2str(ioloop_timeval.tv_usec),
+			       count++, deliver_set->hostname);
+}
+
+#include "settings.h"
+#include "../master/master-settings.h"
+#include "../master/master-settings-defs.c"
+
+#define IS_WHITE(c) ((c) == ' ' || (c) == '\t')
+
+static bool setting_is_bool(const char *name)
+{
+	const struct setting_def *def;
+
+	for (def = setting_defs; def->name != NULL; def++) {
+		if (strcmp(def->name, name) == 0)
+			return def->type == SET_BOOL;
+	}
+	if (strncmp(name, "NAMESPACE_", 10) == 0) {
+		return strstr(name, "_list") != NULL ||
+			strstr(name, "_inbox") != NULL ||
+			strstr(name, "_hidden") != NULL ||
+			strstr(name, "_subscriptions") != NULL;
+	}
+	if (strcmp(name, "quota_full_tempfail") == 0)
+		return TRUE;
+	return FALSE;
+}
+
+/* more ugly kludging because we have our own config parsing code.
+   hopefully this goes away in v1.2. */
+static struct {
+	const char *name;
+	bool set;
+} default_yes_settings[] = {
+	{ "dotlock_use_excl", TRUE },
+	{ "maildir_copy_with_hardlinks", TRUE },
+	{ "mbox_dirty_syncs", TRUE },
+	{ "mbox_lazy_writes", TRUE }
+};
+
+static void config_file_init(const char *path)
+{
+	struct istream *input;
+	const char *key, *value, *str, *ukey;
+	char *line, *p, quote;
+	int fd, sections = 0;
+	bool lda_section = FALSE, pop3_section = FALSE, plugin_section = FALSE;
+	bool ns_section = FALSE, ns_location = FALSE, ns_list = FALSE;
+	bool ns_subscriptions = FALSE;
+	unsigned int i, ns_idx = 0;
+	size_t len;
+
+	plugin_pool = pool_alloconly_create("Plugin strings", 512);
+	i_array_init(&lda_envs, 16);
+	i_array_init(&plugin_envs, 16);
+
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		i_fatal_status(EX_TEMPFAIL, "open(%s) failed: %m", path);
+
+	input = i_stream_create_fd(fd, (size_t)-1, TRUE);
+	i_stream_set_return_partial_line(input, TRUE);
+	while ((line = i_stream_read_next_line(input)) != NULL) {
+		/* @UNSAFE: line is modified */
+
+		/* skip whitespace */
+		while (IS_WHITE(*line))
+			line++;
+
+		/* ignore comments or empty lines */
+		if (*line == '#' || *line == '\0')
+			continue;
+
+		/* strip away comments. pretty kludgy way really.. */
+		for (p = line; *p != '\0'; p++) {
+			if (*p == '\'' || *p == '"') {
+				quote = *p;
+				for (p++; *p != quote && *p != '\0'; p++) {
+					if (*p == '\\' && p[1] != '\0')
+						p++;
+				}
+				if (*p == '\0')
+					break;
+			} else if (*p == '#') {
+				*p = '\0';
+				break;
+			}
+		}
+
+		/* remove whitespace from end of line */
+		len = strlen(line);
+		while (IS_WHITE(line[len-1]))
+			len--;
+		line[len] = '\0';
+
+		if (strncmp(line, "!include_try ", 13) == 0)
+			continue;
+		if (strncmp(line, "!include ", 9) == 0) {
+			i_fatal_status(EX_TEMPFAIL, "Error in config file %s: "
+				       "deliver doesn't support !include directive", path);
+		}
+
+		value = p = strchr(line, '=');
+		if (value == NULL) {
+			if (strchr(line, '{') != NULL) {
+				if (strcmp(line, "protocol lda {") == 0)
+					lda_section = TRUE;
+				else if (strcmp(line, "plugin {") == 0)
+					plugin_section = TRUE;
+				else if (strcmp(line, "protocol pop3 {") == 0)
+					pop3_section = TRUE;
+				else if (strncmp(line, "namespace ", 10) == 0) {
+					ns_section = TRUE;
+					ns_idx++;
+					line += 10;
+					env_put(t_strdup_printf(
+						"NAMESPACE_%u_TYPE=%s", ns_idx,
+						t_strcut(line, ' ')));
+				}
+				sections++;
+			}
+			if (*line == '}') {
+				sections--;
+				lda_section = FALSE;
+				plugin_section = FALSE;
+				pop3_section = FALSE;
+				if (ns_section) {
+					ns_section = FALSE;
+					if (ns_location)
+						ns_location = FALSE;
+					else {
+						env_put(t_strdup_printf(
+							"NAMESPACE_%u=", ns_idx));
+					}
+					if (ns_list)
+						ns_list = FALSE;
+					else {
+						env_put(t_strdup_printf(
+							"NAMESPACE_%u_LIST=1", ns_idx));
+					}
+					if (ns_subscriptions)
+						ns_subscriptions = FALSE;
+					else {
+						env_put(t_strdup_printf(
+							"NAMESPACE_%u_SUBSCRIPTIONS=1",
+							ns_idx));
+					}
+				}
+			}
+			continue;
+		}
+
+		while (p > line && IS_WHITE(p[-1])) p--;
+		key = t_strdup_until(line, p);
+
+		if (sections > 0 && !lda_section && !plugin_section) {
+			if (pop3_section) {
+				if (strcmp(key, "pop3_uidl_format") != 0)
+					continue;
+			} else if (ns_section) {
+				if (strcmp(key, "separator") == 0) {
+					key = t_strdup_printf(
+						"NAMESPACE_%u_SEP", ns_idx);
+				} else if (strcmp(key, "location") == 0) {
+					ns_location = TRUE;
+					key = t_strdup_printf("NAMESPACE_%u",
+							      ns_idx);
+				} else {
+					if (strcmp(key, "list") == 0)
+						ns_list = TRUE;
+					if (strcmp(key, "subscriptions") == 0)
+						ns_subscriptions = TRUE;
+					key = t_strdup_printf("NAMESPACE_%u_%s",
+							      ns_idx, key);
+				}
+			} else {
+				/* unwanted section */
+				continue;
+			}
+		}
+
+		do {
+			value++;
+		} while (IS_WHITE(*value));
+
+		len = strlen(value);
+		if (len > 0 &&
+		    ((*value == '"' && value[len-1] == '"') ||
+		     (*value == '\'' && value[len-1] == '\''))) {
+			value = str_unescape(p_strndup(unsafe_data_stack_pool,
+						       value+1, len - 2));
+		}
+		ukey = t_str_ucase(key);
+		if (setting_is_bool(key) && strcasecmp(value, "yes") != 0) {
+			for (i = 0; i < N_ELEMENTS(default_yes_settings); i++) {
+				if (strcmp(default_yes_settings[i].name,
+					   key) == 0)
+					default_yes_settings[i].set = FALSE;
+			}
+			env_remove(ukey);
+			continue;
+		}
+
+		if (lda_section) {
+			str = p_strconcat(plugin_pool, ukey, "=", value, NULL);
+			array_append(&lda_envs, &str, 1);
+		}
+		if (!plugin_section) {
+			env_put(t_strconcat(ukey, "=", value, NULL));
+		} else {
+			/* %variables need to be expanded.
+			   store these for later. */
+			value = p_strconcat(plugin_pool,
+					    ukey, "=", value, NULL);
+			array_append(&plugin_envs, &value, 1);
+		}
+	}
+	i_stream_unref(&input);
+
+	for (i = 0; i < N_ELEMENTS(default_yes_settings); i++) {
+		if (default_yes_settings[i].set) {
+			key = default_yes_settings[i].name;
+			env_put(t_strconcat(t_str_ucase(key), "=1", NULL));
+		}
+	}
+}
+
+static const struct var_expand_table *
+get_var_expand_table(const char *user, const char *home)
+{
+	static struct var_expand_table static_tab[] = {
+		{ 'u', NULL, "user" },
+		{ 'n', NULL, "username" },
+		{ 'd', NULL, "domain" },
+		{ 's', NULL, "service" },
+		{ 'h', NULL, "home" },
+		{ 'l', NULL, "lip" },
+		{ 'r', NULL, "rip" },
+		{ 'p', NULL, "pid" },
+		{ 'i', NULL, "uid" },
+		{ '\0', NULL, NULL }
+	};
+	struct var_expand_table *tab;
+
+	tab = t_malloc(sizeof(static_tab));
+	memcpy(tab, static_tab, sizeof(static_tab));
+
+	tab[0].value = user;
+	tab[1].value = t_strcut(user, '@');
+	tab[2].value = strchr(user, '@');
+	if (tab[2].value != NULL) tab[2].value++;
+	tab[3].value = "DELIVER";
+	tab[4].value = home != NULL ? home :
+		"/HOME_DIRECTORY_USED_BUT_NOT_GIVEN_BY_USERDB";
+	tab[5].value = NULL;
+	tab[6].value = NULL;
+	tab[7].value = my_pid;
+	tab[8].value = dec2str(geteuid());
+
+	return tab;
+}
+
+static const char *
+expand_mail_env(const char *env, const struct var_expand_table *table)
+{
+	string_t *str;
+	const char *p;
+
+	str = t_str_new(256);
+
+	/* it's either type:data or just data */
+	p = strchr(env, ':');
+	if (p != NULL) {
+		while (env != p) {
+			str_append_c(str, *env);
+			env++;
+		}
+
+		str_append_c(str, *env++);
+	}
+
+	if (env[0] == '~' && env[1] == '/') {
+		/* expand home */
+		env = t_strconcat("%h", env+1, NULL);
+	}
+
+	/* expand %vars */
+	var_expand(str, env, table);
+	return str_c(str);
+}
+
+static const char *escape_local_part(const char *local_part)
+{
+	const char *p;
+
+	/* if local_part isn't dot-atom-text, we need to return quoted-string
+	   dot-atom-text = 1*atext *("." 1*atext) */
+	for (p = local_part; *p != '\0'; p++) {
+		if (!IS_ATEXT(*p) && *p != '.')
+			break;
+	}
+	if (*p != '\0' || *local_part == '.' ||
+	    (p != local_part && p[-1] == '.'))
+		local_part = t_strdup_printf("\"%s\"", str_escape(local_part));
+	return local_part;
+}
+
+static const char *address_sanitize(const char *address)
+{
+	struct message_address *addr;
+	const char *ret, *mailbox;
+	pool_t pool;
+
+	pool = pool_alloconly_create("address sanitizer", 256);
+	addr = message_address_parse(pool, (const unsigned char *)address,
+				     strlen(address), 1, FALSE);
+
+	if (addr == NULL || addr->mailbox == NULL || addr->domain == NULL ||
+	    *addr->mailbox == '\0')
+		ret = DEFAULT_ENVELOPE_SENDER;
+	else {
+		mailbox = escape_local_part(addr->mailbox);
+		if (*addr->domain == '\0')
+			ret = t_strdup(mailbox);
+		else
+			ret = t_strdup_printf("%s@%s", mailbox, addr->domain);
+	}
+	pool_unref(&pool);
+	return ret;
+}
+
+static int deliver_create_dir(struct mail_user *user, const char *dir)
+{
+	struct mail_namespace *ns;
+	const char *origin;
+	mode_t mode;
+	gid_t gid;
+
+	ns = mail_namespace_find_inbox(user->namespaces);
+	if (ns == NULL)
+		ns = user->namespaces;
+
+	mailbox_list_get_dir_permissions(ns->list, NULL, &mode, &gid, &origin);
+	if (mkdir_parents_chgrp(dir, mode, gid, origin) == 0) {
+		return 0;
+	} else if (errno == EACCES) {
+		i_error("%s", eacces_error_get_creating("mkdir_parents_chown",
+							dir));
+		return -1;
+	} else {
+		i_error("mkdir_parents_chown(%s, gid=%s) failed: %m",
+			dir, dec2str(gid));
+		return -1;
+	}
+}
+
+static int seekable_fd_callback(const char **path_r, void *context)
+{
+	struct mail_user *user = context;
+	const char *dir, *p;
+	string_t *path;
+	int fd;
+
+	path = t_str_new(128);
+	str_append(path, mail_user_get_temp_prefix(user));
+	fd = safe_mkstemp(path, 0600, (uid_t)-1, (gid_t)-1);
+	if (fd == -1 && errno == ENOENT) {
+		dir = str_c(path);
+		p = strrchr(dir, '/');
+		if (p != NULL) {
+			dir = t_strdup_until(dir, p);
+			if (deliver_create_dir(user, dir) < 0)
+				return -1;
+			fd = safe_mkstemp(path, 0600, (uid_t)-1, (gid_t)-1);
+		}
+	}
+	if (fd == -1) {
+		i_error("safe_mkstemp(%s) failed: %m", str_c(path));
+		return -1;
+	}
+
+	/* we just want the fd, unlink it */
+	if (unlink(str_c(path)) < 0) {
+		/* shouldn't happen.. */
+		i_error("unlink(%s) failed: %m", str_c(path));
+		close_keep_errno(fd);
+		return -1;
+	}
+
+	*path_r = str_c(path);
+	return fd;
+}
+
+static struct istream *
+create_raw_stream(struct mail_user *user, int fd, time_t *mtime_r)
+{
+	struct istream *input, *input2, *input_list[2];
+	const unsigned char *data;
+	char *sender = NULL;
+	size_t i, size;
+	int ret, tz;
+
+	*mtime_r = (time_t)-1;
+	fd_set_nonblock(fd, FALSE);
+
+	input = i_stream_create_fd(fd, 4096, FALSE);
+	input->blocking = TRUE;
+	/* If input begins with a From-line, drop it */
+	ret = i_stream_read_data(input, &data, &size, 5);
+	if (ret > 0 && size >= 5 && memcmp(data, "From ", 5) == 0) {
+		/* skip until the first LF */
+		i_stream_skip(input, 5);
+		while ((ret = i_stream_read_data(input, &data, &size, 0)) > 0) {
+			for (i = 0; i < size; i++) {
+				if (data[i] == '\n')
+					break;
+			}
+			if (i != size) {
+				(void)mbox_from_parse(data, i, mtime_r, &tz,
+						      &sender);
+				i_stream_skip(input, i + 1);
+				break;
+			}
+			i_stream_skip(input, size);
+		}
+	}
+
+	if (sender != NULL && explicit_envelope_sender == NULL) {
+		/* use the envelope sender from From_-line, but only if it
+		   hasn't been specified with -f already. */
+		explicit_envelope_sender = i_strdup(sender);
+	}
+	i_free(sender);
+
+	if (input->v_offset == 0) {
+		input2 = input;
+		i_stream_ref(input2);
+	} else {
+		input2 = i_stream_create_limit(input, (uoff_t)-1);
+	}
+	i_stream_unref(&input);
+
+	input_list[0] = input2; input_list[1] = NULL;
+	input = i_stream_create_seekable(input_list, MAIL_MAX_MEMORY_BUFFER,
+					 seekable_fd_callback, user);
+	i_stream_unref(&input2);
+	return input;
+}
+
+static void failure_exit_callback(int *status)
+{
+	/* we want all our exit codes to be sysexits.h compatible.
+	   if we failed because of a logging related error, we most likely
+	   aren't writing to stderr, so try writing there to give some kind of
+	   a clue what's wrong. FATAL_LOGOPEN failure already wrote to
+	   stderr, so don't duplicate it. */
+	switch (*status) {
+	case FATAL_LOGWRITE:
+		fputs("Failed to write to log file", stderr);
+		break;
+	case FATAL_LOGERROR:
+		fputs("Internal logging error", stderr);
+		break;
+	case FATAL_LOGOPEN:
+	case FATAL_OUTOFMEM:
+	case FATAL_EXEC:
+	case FATAL_DEFAULT:
+		break;
+	default:
+		return;
+	}
+	*status = EX_TEMPFAIL;
+}
+
+static void open_logfile(const char *username)
+{
+	const char *prefix, *log_path, *stamp;
+
+	prefix = t_strdup_printf("deliver(%s): ", username);
+	log_path = home_expand(getenv("LOG_PATH"));
+	if (log_path == NULL || *log_path == '\0') {
+		const char *env = getenv("SYSLOG_FACILITY");
+		int facility;
+
+		if (env == NULL || !syslog_facility_find(env, &facility))
+			facility = LOG_MAIL;
+		i_set_failure_prefix(prefix);
+		i_set_failure_syslog("dovecot", LOG_NDELAY, facility);
+	} else {
+		/* log to file or stderr */
+		i_set_failure_file(log_path, prefix);
+	}
+
+	log_path = home_expand(getenv("INFO_LOG_PATH"));
+	if (log_path != NULL && *log_path != '\0')
+		i_set_info_file(log_path);
+
+	stamp = getenv("LOG_TIMESTAMP");
+	if (stamp == NULL)
+		stamp = DEFAULT_FAILURE_STAMP_FORMAT;
+	i_set_failure_timestamp_format(stamp);
+}
+
+static void print_help(void)
+{
+	printf(
+"Usage: deliver [-c <config file>] [-a <address>] [-d <username>] [-p <path>]\n"
+"               [-f <envelope sender>] [-m <mailbox>] [-n] [-s] [-e] [-k]\n");
+}
+
+void deliver_env_clean(bool preserve_home)
+{
+	const char *tz, *home;
+
+	tz = getenv("TZ");
+	if (tz != NULL)
+		tz = t_strconcat("TZ=", tz, NULL);
+	home = preserve_home ? getenv("HOME") : NULL;
+	if (home != NULL)
+		home = t_strconcat("HOME=", home, NULL);
+
+	/* Note that if the original environment was set with env_put(), the
+	   environment strings will be invalid after env_clean(). That's why
+	   we t_strconcat() them above. */
+	env_clean();
+
+	if (tz != NULL) env_put(tz);
+	if (home != NULL) env_put(home);
+}
+
+static void expand_envs(const char *user)
+{
+        const struct var_expand_table *table;
+	const char *value, *const *envs, *home, *env_name;
+	unsigned int i, count;
+	string_t *str;
+
+	home = getenv("HOME");
+
+	str = t_str_new(256);
+	table = get_var_expand_table(user, home);
+	envs = array_get(&plugin_envs, &count);
+	for (i = 0; i < count; i++) {
+		str_truncate(str, 0);
+		var_expand(str, envs[i], table);
+		env_put(str_c(str));
+	}
+	/* add LDA envs again to make sure they override plugin settings */
+	envs = array_get(&lda_envs, &count);
+	for (i = 0; i < count; i++)
+		env_put(envs[i]);
+
+	/* get the table again in case plugin envs provided the home
+	   directory (yea, kludgy) */
+	if (home == NULL)
+		home = getenv("HOME");
+	table = get_var_expand_table(user, home);
+
+	value = getenv("MAIL_LOCATION");
+	if (value != NULL)
+		value = expand_mail_env(value, table);
+	env_put(t_strconcat("MAIL=", value, NULL));
+
+	for (i = 1;; i++) {
+		env_name = t_strdup_printf("NAMESPACE_%u", i);
+		value = getenv(env_name);
+		if (value == NULL)
+			break;
+
+		value = expand_mail_env(value, table);
+		env_put(t_strconcat(env_name, "=", value, NULL));
+
+		env_name = t_strdup_printf("NAMESPACE_%u_PREFIX", i);
+		value = getenv(env_name);
+		if (value != NULL) {
+			str_truncate(str, 0);
+			var_expand(str, value, table);
+			env_put(t_strconcat(env_name, "=", str_c(str), NULL));
+		}
+	}
+}
+
+static void putenv_extra_fields(const ARRAY_TYPE(const_string) *extra_fields)
+{
+	const char *const *fields;
+	const char *key, *p;
+	unsigned int i, count;
+
+	fields = array_get(extra_fields, &count);
+	for (i = 0; i < count; i++) {
+		p = strchr(fields[i], '=');
+		if (p == NULL)
+			env_put(t_strconcat(fields[i], "=1", NULL));
+		else {
+			key = t_str_ucase(t_strdup_until(fields[i], p));
+			env_put(t_strconcat(key, p, NULL));
+		}
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	const char *config_path = DEFAULT_CONFIG_FILE;
+	const char *mailbox = "INBOX";
+	const char *auth_socket;
+	const char *home, *destaddr, *user, *value, *errstr, *path, *orig_user;
+	ARRAY_TYPE(const_string) extra_fields = ARRAY_INIT;
+	struct mail_user *mail_user, *raw_mail_user;
+	struct mail_namespace *raw_ns;
+	struct mail_storage *storage;
+	struct mailbox *box;
+	struct raw_mailbox *raw_box;
+	struct istream *input;
+	struct mailbox_transaction_context *t;
+	struct mailbox_header_lookup_ctx *headers_ctx;
+	struct mail *mail;
+	char cwd[PATH_MAX];
+	uid_t process_euid;
+	bool stderr_rejection = FALSE;
+	bool keep_environment = FALSE;
+	bool user_auth = FALSE;
+	time_t mtime;
+	int i, ret;
+	pool_t userdb_pool = NULL;
+	string_t *str;
+	enum mail_error error;
+
+	if (getuid() != geteuid() && geteuid() == 0) {
+		/* running setuid - don't allow this if deliver is
+		   executable by anyone */
+		struct stat st;
+
+		if (stat(argv[0], &st) < 0) {
+			fprintf(stderr, "stat(%s) failed: %s\n",
+				argv[0], strerror(errno));
+			return EX_TEMPFAIL;
+		} else if ((st.st_mode & 1) != 0 && (st.st_mode & 04000) != 0) {
+			fprintf(stderr, "%s must not be both world-executable "
+				"and setuid-root. This allows root exploits. "
+				"See http://wiki.dovecot.org/LDA#multipleuids\n",
+				argv[0]);
+			return EX_TEMPFAIL;
+		}
+	}
+
+	i_set_failure_exit_callback(failure_exit_callback);
+
+	lib_init();
+	ioloop = io_loop_create();
+
+	lib_signals_init();
+        lib_signals_set_handler(SIGINT, TRUE, sig_die, NULL);
+        lib_signals_set_handler(SIGTERM, TRUE, sig_die, NULL);
+        lib_signals_ignore(SIGPIPE, TRUE);
+        lib_signals_ignore(SIGALRM, FALSE);
+#ifdef SIGXFSZ
+        lib_signals_ignore(SIGXFSZ, TRUE);
+#endif
+
+	deliver_set = i_new(struct deliver_settings, 1);
+	deliver_set->mailbox_autocreate = TRUE;
+
+	destaddr = user = path = NULL;
+	for (i = 1; i < argc; i++) {
+		if (strcmp(argv[i], "-a") == 0) {
+			/* destination address */
+			i++;
+			if (i == argc)
+				i_fatal_status(EX_USAGE, "Missing -a argument");
+			destaddr = argv[i];
+		} else if (strcmp(argv[i], "-d") == 0) {
+			/* destination user */
+			i++;
+			if (i == argc)
+				i_fatal_status(EX_USAGE, "Missing -d argument");
+			user = argv[i];
+			user_auth = TRUE;
+		} else if (strcmp(argv[i], "-p") == 0) {
+			/* input path */
+			i++;
+			if (i == argc)
+				i_fatal_status(EX_USAGE, "Missing -p argument");
+			path = argv[i];
+			if (*path != '/') {
+				/* expand relative paths before we chdir */
+				if (getcwd(cwd, sizeof(cwd)) == NULL)
+					i_fatal("getcwd() failed: %m");
+				path = t_strconcat(cwd, "/", path, NULL);
+			}
+		} else if (strcmp(argv[i], "-e") == 0) {
+			stderr_rejection = TRUE;
+		} else if (strcmp(argv[i], "-c") == 0) {
+			/* config file path */
+			i++;
+			if (i == argc) {
+				i_fatal_status(EX_USAGE,
+					"Missing config file path argument");
+			}
+			config_path = argv[i];
+		} else if (strcmp(argv[i], "-k") == 0) {
+			keep_environment = TRUE;
+		} else if (strcmp(argv[i], "-m") == 0) {
+			/* destination mailbox */
+			i++;
+			if (i == argc)
+				i_fatal_status(EX_USAGE, "Missing -m argument");
+			/* Ignore -m "". This allows doing -m ${extension}
+			   in Postfix to handle user+mailbox */
+			if (*argv[i] != '\0') {
+				str = t_str_new(256);
+				if (imap_utf8_to_utf7(argv[i], str) < 0) {
+					i_fatal("Mailbox name not UTF-8: %s",
+						mailbox);
+				}
+				mailbox = str_c(str);
+			}
+		} else if (strcmp(argv[i], "-n") == 0) {
+			deliver_set->mailbox_autocreate = FALSE;
+		} else if (strcmp(argv[i], "-s") == 0) {
+			deliver_set->mailbox_autosubscribe = TRUE;
+		} else if (strcmp(argv[i], "-f") == 0) {
+			/* envelope sender address */
+			i++;
+			if (i == argc)
+				i_fatal_status(EX_USAGE, "Missing -f argument");
+			explicit_envelope_sender =
+				i_strdup(address_sanitize(argv[i]));
+		} else if (argv[i][0] != '\0') {
+			print_help();
+			i_fatal_status(EX_USAGE,
+				       "Unknown argument: %s", argv[i]);
+		}
+	}
+
+	if (user == NULL)
+		user = getenv("USER");
+	if (!keep_environment)
+		deliver_env_clean(!user_auth);
+
+	process_euid = geteuid();
+	if (user_auth)
+		;
+	else if (process_euid != 0) {
+		/* we're non-root. get our username and possibly our home. */
+		struct passwd *pw;
+
+		home = getenv("HOME");
+		if (user != NULL && home != NULL) {
+			/* no need for a pw lookup */
+		} else if ((pw = getpwuid(process_euid)) != NULL) {
+			user = t_strdup(pw->pw_name);
+			if (home == NULL)
+				env_put(t_strconcat("HOME=", pw->pw_dir, NULL));
+		} else if (user == NULL) {
+			i_fatal_status(EX_USAGE,
+				       "Couldn't lookup our username (uid=%s)",
+				       dec2str(process_euid));
+		}
+	} else {
+		i_fatal_status(EX_USAGE,
+			"destination user parameter (-d user) not given");
+	}
+
+	T_BEGIN {
+		config_file_init(config_path);
+	} T_END;
+	open_logfile(user);
+
+	if (getenv("MAIL_DEBUG") != NULL)
+		env_put("DEBUG=1");
+
+	if (getenv("MAIL_PLUGINS") == NULL)
+		modules = NULL;
+	else {
+		const char *plugin_dir = getenv("MAIL_PLUGIN_DIR");
+		const char *version;
+
+		if (plugin_dir == NULL)
+			plugin_dir = MODULEDIR"/lda";
+
+		version = getenv("VERSION_IGNORE") != NULL ?
+			NULL : PACKAGE_VERSION;
+		modules = module_dir_load(plugin_dir, getenv("MAIL_PLUGINS"),
+					  TRUE, version);
+	}
+
+	if (user_auth) {
+		auth_socket = getenv("AUTH_SOCKET_PATH");
+		if (auth_socket == NULL) {
+			const char *base_dir = getenv("BASE_DIR");
+			if (base_dir == NULL)
+				base_dir = PKG_RUNDIR;
+			auth_socket = t_strconcat(base_dir, "/auth-master",
+						  NULL);
+		}
+
+		userdb_pool = pool_alloconly_create("userdb lookup replys", 512);
+		orig_user = user;
+		ret = auth_client_lookup_and_restrict(auth_socket,
+						      &user, process_euid,
+						      userdb_pool,
+						      &extra_fields);
+		if (ret != 0)
+			return ret;
+
+		if (strcmp(user, orig_user) != 0) {
+			/* auth lookup changed the user. */
+			if (getenv("DEBUG") != NULL)
+				i_info("userdb changed username to %s", user);
+			i_set_failure_prefix(t_strdup_printf("deliver(%s): ",
+							     user));
+		}
+		/* if user was changed, it was allocated from userdb_pool
+		   which we'll free soon. */
+		user = t_strdup(user);
+	}
+
+	expand_envs(user);
+	if (userdb_pool != NULL) {
+		putenv_extra_fields(&extra_fields);
+		pool_unref(&userdb_pool);
+	}
+
+	/* Fix namespaces with empty locations */
+	for (i = 1;; i++) {
+		value = getenv(t_strdup_printf("NAMESPACE_%u", i));
+		if (value == NULL)
+			break;
+
+		if (*value == '\0') {
+			env_put(t_strdup_printf("NAMESPACE_%u=%s", i,
+						getenv("MAIL")));
+		}
+	}
+
+	/* If possible chdir to home directory, so that core file
+	   could be written in case we crash. */
+	home = getenv("HOME");
+	if (home != NULL) {
+		if (chdir(home) < 0) {
+			if (errno != ENOENT)
+				i_error("chdir(%s) failed: %m", home);
+			else if (getenv("DEBUG") != NULL)
+				i_info("Home dir not found: %s", home);
+		}
+	}
+
+	env_put(t_strconcat("USER=", user, NULL));
+	(void)umask(0077);
+
+	deliver_set->hostname = getenv("HOSTNAME");
+	if (deliver_set->hostname == NULL)
+		deliver_set->hostname = my_hostname;
+	deliver_set->postmaster_address = getenv("POSTMASTER_ADDRESS");
+	if (deliver_set->postmaster_address == NULL) {
+		i_fatal_status(EX_TEMPFAIL,
+			       "postmaster_address setting not given");
+	}
+	deliver_set->sendmail_path = getenv("SENDMAIL_PATH");
+	if (deliver_set->sendmail_path == NULL)
+		deliver_set->sendmail_path = DEFAULT_SENDMAIL_PATH;
+	deliver_set->rejection_subject = getenv("REJECTION_SUBJECT");
+	if (deliver_set->rejection_subject == NULL)
+		deliver_set->rejection_subject = DEFAULT_MAIL_REJECTION_SUBJECT;
+	deliver_set->rejection_reason = getenv("REJECTION_REASON");
+	if (deliver_set->rejection_reason == NULL) {
+		deliver_set->rejection_reason =
+			DEFAULT_MAIL_REJECTION_HUMAN_REASON;
+	}
+	deliver_set->log_format = getenv("DELIVER_LOG_FORMAT");
+	if (deliver_set->log_format == NULL)
+		deliver_set->log_format = DEFAULT_LOG_FORMAT;
+
+	dict_drivers_register_builtin();
+        duplicate_init();
+	mail_users_init(getenv("AUTH_SOCKET_PATH"), getenv("DEBUG") != NULL);
+        mail_storage_init();
+	mail_storage_register_all();
+	mailbox_list_register_all();
+
+	module_dir_init(modules);
+
+	mail_user = mail_user_init(user);
+	mail_user_set_home(mail_user, home);
+	if (mail_namespaces_init(mail_user) < 0)
+		i_fatal("Namespace initialization failed");
+
+	/* create a separate mail user for the internal namespace */
+	raw_mail_user = mail_user_init(user);
+	mail_user_set_home(raw_mail_user, NULL);
+	raw_ns = mail_namespaces_init_empty(raw_mail_user);
+	raw_ns->flags |= NAMESPACE_FLAG_NOQUOTA | NAMESPACE_FLAG_NOACL;
+
+	if (mail_storage_create(raw_ns, "raw", "/tmp",
+				MAIL_STORAGE_FLAG_FULL_FS_ACCESS,
+				FILE_LOCK_METHOD_FCNTL, &errstr) < 0)
+		i_fatal("Couldn't create internal raw storage: %s", errstr);
+	if (path == NULL) {
+		input = create_raw_stream(mail_user, 0, &mtime);
+		box = mailbox_open(&raw_ns->storage, "Dovecot Delivery Mail",
+				   input, MAILBOX_OPEN_NO_INDEX_FILES);
+		i_stream_unref(&input);
+	} else {
+		mtime = (time_t)-1;
+		box = mailbox_open(&raw_ns->storage, path, NULL,
+				   MAILBOX_OPEN_NO_INDEX_FILES);
+	}
+	if (box == NULL) {
+		i_fatal("Can't open delivery mail as raw: %s",
+			mail_storage_get_last_error(raw_ns->storage, &error));
+	}
+	if (mailbox_sync(box, 0, 0, NULL) < 0) {
+		i_fatal("Can't sync delivery mail: %s",
+			mail_storage_get_last_error(raw_ns->storage, &error));
+	}
+	raw_box = (struct raw_mailbox *)box;
+	raw_box->envelope_sender = explicit_envelope_sender != NULL ?
+		explicit_envelope_sender : DEFAULT_ENVELOPE_SENDER;
+	raw_box->mtime = mtime;
+
+	t = mailbox_transaction_begin(box, 0);
+	headers_ctx = mailbox_header_lookup_init(box, wanted_headers);
+	mail = mail_alloc(t, 0, headers_ctx);
+	mail_set_seq(mail, 1);
+
+	if (destaddr == NULL) {
+		destaddr = deliver_get_address(mail, "Envelope-To");
+		if (destaddr == NULL) {
+			destaddr = strchr(user, '@') != NULL ? user :
+				t_strconcat(user, "@",
+					    deliver_set->hostname, NULL);
+		}
+	}
+
+	storage = NULL;
+	default_mailbox_name = mailbox;
+	if (deliver_mail == NULL)
+		ret = -1;
+	else {
+		if (deliver_mail(mail_user->namespaces, &storage, mail,
+				 destaddr, mailbox) <= 0) {
+			/* if message was saved, don't bounce it even though
+			   the script failed later. */
+			ret = saved_mail ? 0 : -1;
+		} else {
+			/* success. message may or may not have been saved. */
+			ret = 0;
+		}
+	}
+
+	if (ret < 0 && !tried_default_save) {
+		/* plugins didn't handle this. save into the default mailbox. */
+		ret = deliver_save(mail_user->namespaces,
+				   &storage, mailbox, mail, 0, NULL);
+	}
+	if (ret < 0 && strcasecmp(mailbox, "INBOX") != 0) {
+		/* still didn't work. try once more to save it
+		   to INBOX. */
+		ret = deliver_save(mail_user->namespaces,
+				   &storage, "INBOX", mail, 0, NULL);
+	}
+
+	if (ret < 0 ) {
+		const char *error_string;
+		enum mail_error error;
+
+		if (storage == NULL) {
+			/* This shouldn't happen */
+			i_error("BUG: Saving failed for unknown storage");
+			return EX_TEMPFAIL;
+		}
+
+		error_string = mail_storage_get_last_error(storage, &error);
+
+		if (stderr_rejection) {
+			/* write to stderr also for tempfails so that MTA
+			   can log the reason if it wants to. */
+			fprintf(stderr, "%s\n", error_string);
+		}
+
+		if (error != MAIL_ERROR_NOSPACE ||
+		    getenv("QUOTA_FULL_TEMPFAIL") != NULL) {
+			/* Saving to INBOX should always work unless
+			   we're over quota. If it didn't, it's probably a
+			   configuration problem. */
+			return EX_TEMPFAIL;
+		}
+
+		/* we'll have to reply with permanent failure */
+		deliver_log(mail, "rejected: %s",
+			    str_sanitize(error_string, 512));
+
+		if (stderr_rejection)
+			return EX_NOPERM;
+		ret = mail_send_rejection(mail, user, error_string);
+		if (ret != 0)
+			return ret < 0 ? EX_TEMPFAIL : ret;
+		/* ok, rejection sent */
+	}
+	i_free(explicit_envelope_sender);
+
+	mail_free(&mail);
+	mailbox_header_lookup_unref(&headers_ctx);
+	mailbox_transaction_rollback(&t);
+	mailbox_close(&box);
+
+	mail_user_unref(&mail_user);
+	mail_user_unref(&raw_mail_user);
+
+	module_dir_unload(&modules);
+	mail_storage_deinit();
+	mail_users_deinit();
+
+	duplicate_deinit();
+	dict_drivers_unregister_builtin();
+	lib_signals_deinit();
+
+	io_loop_destroy(&ioloop);
+	lib_deinit();
+
+        return EX_OK;
+}

=== added file 'src/deliver/deliver.h'
--- src/deliver/deliver.h	1970-01-01 00:00:00 +0000
+++ src/deliver/deliver.h	2010-02-13 00:05:29 +0000
@@ -0,0 +1,50 @@
+#ifndef DELIVER_H
+#define DELIVER_H
+
+#include <sysexits.h>
+
+#include "lib.h"
+#include "mail-storage.h"
+
+#define DEFAULT_MAIL_REJECTION_SUBJECT \
+	"Rejected: %s"
+#define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
+	"Your message to <%t> was automatically rejected:%n%r"
+#define DEFAULT_LOG_FORMAT "msgid=%m: %$"
+
+struct deliver_settings {
+	const char *hostname;
+	const char *postmaster_address;
+	const char *sendmail_path;
+	const char *rejection_subject;
+	const char *rejection_reason;
+	const char *log_format;
+	bool mailbox_autosubscribe;
+	bool mailbox_autocreate;
+};
+
+extern struct deliver_settings *deliver_set;
+extern bool tried_default_save;
+
+typedef int deliver_mail_func_t(struct mail_namespace *namespaces,
+				struct mail_storage **storage_r,
+				struct mail *mail,
+				const char *destaddr, const char *mailbox);
+
+extern deliver_mail_func_t *deliver_mail;
+
+void deliver_env_clean(bool preserve_home);
+
+/* Save a mail into given mailbox with given flags and keywords. */
+int deliver_save(struct mail_namespace *namespaces,
+		 struct mail_storage **storage_r, const char *mailbox,
+		 struct mail *mail, enum mail_flags flags,
+		 const char *const *keywords);
+
+/* Extracts user@domain from Return-Path header. Returns NULL if not found. */
+const char *deliver_get_return_address(struct mail *mail);
+
+/* Returns a new unique Message-ID */
+const char *deliver_get_new_message_id(void);
+
+#endif

=== removed file 'src/deliver/deliver.h'
--- src/deliver/deliver.h	2009-11-06 00:47:29 +0000
+++ src/deliver/deliver.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-#ifndef DELIVER_H
-#define DELIVER_H
-
-#include <sysexits.h>
-
-#include "lib.h"
-#include "mail-storage.h"
-
-#define DEFAULT_MAIL_REJECTION_SUBJECT \
-	"Rejected: %s"
-#define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
-	"Your message to <%t> was automatically rejected:%n%r"
-#define DEFAULT_LOG_FORMAT "msgid=%m: %$"
-
-struct deliver_settings {
-	const char *hostname;
-	const char *postmaster_address;
-	const char *sendmail_path;
-	const char *rejection_subject;
-	const char *rejection_reason;
-	const char *log_format;
-	bool mailbox_autosubscribe;
-	bool mailbox_autocreate;
-};
-
-extern struct deliver_settings *deliver_set;
-extern bool tried_default_save;
-
-typedef int deliver_mail_func_t(struct mail_namespace *namespaces,
-				struct mail_storage **storage_r,
-				struct mail *mail,
-				const char *destaddr, const char *mailbox);
-
-extern deliver_mail_func_t *deliver_mail;
-
-void deliver_env_clean(bool preserve_home);
-
-/* Save a mail into given mailbox with given flags and keywords. */
-int deliver_save(struct mail_namespace *namespaces,
-		 struct mail_storage **storage_r, const char *mailbox,
-		 struct mail *mail, enum mail_flags flags,
-		 const char *const *keywords);
-
-/* Extracts user@domain from Return-Path header. Returns NULL if not found. */
-const char *deliver_get_return_address(struct mail *mail);
-
-/* Returns a new unique Message-ID */
-const char *deliver_get_new_message_id(void);
-
-#endif

=== added file 'src/deliver/duplicate.c'
--- src/deliver/duplicate.c	1970-01-01 00:00:00 +0000
+++ src/deliver/duplicate.c	2010-02-13 00:05:29 +0000
@@ -0,0 +1,324 @@
+/* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "ioloop.h"
+#include "istream.h"
+#include "ostream.h"
+#include "home-expand.h"
+#include "file-dotlock.h"
+#include "hash.h"
+#include "duplicate.h"
+
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#define DUPLICATE_PATH "~/.dovecot.lda-dupes"
+#define COMPRESS_PERCENTAGE 10
+#define DUPLICATE_BUFSIZE 4096
+#define DUPLICATE_VERSION 2
+
+struct duplicate {
+	const void *id;
+	unsigned int id_size;
+
+	const char *user;
+	time_t time;
+};
+
+struct duplicate_file_header {
+	uint32_t version;
+};
+
+struct duplicate_record_header {
+	uint32_t stamp;
+	uint32_t id_size;
+	uint32_t user_size;
+};
+
+struct duplicate_file {
+	pool_t pool;
+	struct hash_table *hash;
+	const char *path;
+
+	int new_fd;
+	struct dotlock *dotlock;
+	unsigned int changed:1;
+};
+
+static struct dotlock_settings duplicate_dotlock_set = {
+	MEMBER(temp_prefix) NULL,
+	MEMBER(lock_suffix) NULL,
+
+	MEMBER(timeout) 20,
+	MEMBER(stale_timeout) 10,
+
+	MEMBER(callback) NULL,
+	MEMBER(context) NULL,
+
+	MEMBER(use_excl_lock) FALSE
+};
+static struct duplicate_file *duplicate_file = NULL;
+
+static int duplicate_cmp(const void *p1, const void *p2)
+{
+	const struct duplicate *d1 = p1, *d2 = p2;
+
+	return (d1->id_size == d2->id_size &&
+		memcmp(d1->id, d2->id, d1->id_size) == 0 &&
+		strcasecmp(d1->user, d2->user) == 0) ? 0 : 1;
+}
+
+static unsigned int duplicate_hash(const void *p)
+{
+	/* a char* hash function from ASU -- from glib */
+	const struct duplicate *d = p;
+        const unsigned char *s = d->id, *end = s + d->id_size;
+	unsigned int g, h = 0;
+
+	while (s != end) {
+		h = (h << 4) + *s;
+		if ((g = h & 0xf0000000UL)) {
+			h = h ^ (g >> 24);
+			h = h ^ g;
+		}
+		s++;
+	}
+
+	return h ^ strcase_hash(d->user);
+}
+
+static int
+duplicate_read_records(struct duplicate_file *file, struct istream *input,
+		       unsigned int record_size)
+{
+	const unsigned char *data;
+	struct duplicate_record_header hdr;
+	size_t size;
+	unsigned int change_count;
+
+	change_count = 0;
+	while (i_stream_read_data(input, &data, &size, record_size) > 0) {
+		if (record_size == sizeof(hdr))
+			memcpy(&hdr, data, sizeof(hdr));
+		else {
+			/* FIXME: backwards compatibility with v1.0 */
+			time_t stamp;
+
+			i_assert(record_size ==
+				 sizeof(time_t) + sizeof(uint32_t)*2);
+			memcpy(&stamp, data, sizeof(stamp));
+			hdr.stamp = stamp;
+			memcpy(&hdr.id_size, data + sizeof(time_t),
+			       sizeof(hdr.id_size));
+			memcpy(&hdr.user_size,
+			       data + sizeof(time_t) + sizeof(uint32_t),
+			       sizeof(hdr.user_size));
+		}
+		i_stream_skip(input, record_size);
+
+		if (hdr.id_size == 0 || hdr.user_size == 0 ||
+		    hdr.id_size > DUPLICATE_BUFSIZE ||
+		    hdr.user_size > DUPLICATE_BUFSIZE) {
+			i_error("broken duplicate file %s", file->path);
+			return -1;
+		}
+
+		if (i_stream_read_data(input, &data, &size,
+				       hdr.id_size + hdr.user_size - 1) <= 0) {
+			i_error("unexpected end of file in %s", file->path);
+			return -1;
+		}
+
+		if ((time_t)hdr.stamp >= ioloop_time) {
+			/* still valid, save it */
+			struct duplicate *d;
+			void *new_id;
+
+			new_id = p_malloc(file->pool, hdr.id_size);
+			memcpy(new_id, data, hdr.id_size);
+
+			d = p_new(file->pool, struct duplicate, 1);
+			d->id = new_id;
+			d->id_size = hdr.id_size;
+			d->user = p_strndup(file->pool,
+					    data + hdr.id_size, hdr.user_size);
+			d->time = hdr.stamp;
+			hash_table_insert(file->hash, d, d);
+		} else {
+                        change_count++;
+		}
+		i_stream_skip(input, hdr.id_size + hdr.user_size);
+	}
+
+	if (hash_table_count(file->hash) *
+	    COMPRESS_PERCENTAGE / 100 > change_count)
+		file->changed = TRUE;
+	return 0;
+}
+
+static int duplicate_read(struct duplicate_file *file)
+{
+	struct istream *input;
+	struct duplicate_file_header hdr;
+	const unsigned char *data;
+	size_t size;
+	int fd;
+	unsigned int record_size = 0;
+
+	fd = open(file->path, O_RDONLY);
+	if (fd == -1) {
+		if (errno == ENOENT)
+			return 0;
+		i_error("open(%s) failed: %m", file->path);
+		return -1;
+	}
+
+	/* <timestamp> <id_size> <user_size> <id> <user> */
+	input = i_stream_create_fd(fd, DUPLICATE_BUFSIZE, FALSE);
+	if (i_stream_read_data(input, &data, &size, sizeof(hdr)) > 0) {
+		memcpy(&hdr, data, sizeof(hdr));
+		if (hdr.version == 0 || hdr.version > DUPLICATE_VERSION + 10) {
+			/* FIXME: backwards compatibility with v1.0 */
+			record_size = sizeof(time_t) + sizeof(uint32_t)*2;
+		} else if (hdr.version == DUPLICATE_VERSION) {
+			record_size = sizeof(struct duplicate_record_header);
+			i_stream_skip(input, sizeof(hdr));
+		}
+	}
+
+	if (record_size == 0 ||
+	    duplicate_read_records(file, input, record_size) < 0) {
+		if (unlink(file->path) < 0 && errno != ENOENT)
+			i_error("unlink(%s) failed: %m", file->path);
+	}
+
+	i_stream_unref(&input);
+	if (close(fd) < 0)
+		i_error("close(%s) failed: %m", file->path);
+	return 0;
+}
+
+static struct duplicate_file *duplicate_new(const char *path)
+{
+	struct duplicate_file *file;
+	pool_t pool;
+
+	pool = pool_alloconly_create("duplicates", 10240);
+
+	file = p_new(pool, struct duplicate_file, 1);
+	file->pool = pool;
+	file->path = p_strdup(pool, path);
+	file->new_fd = file_dotlock_open(&duplicate_dotlock_set, path, 0,
+					 &file->dotlock);
+	if (file->new_fd == -1)
+		i_error("file_dotlock_create(%s) failed: %m", path);
+	file->hash = hash_table_create(default_pool, pool, 0,
+				       duplicate_hash, duplicate_cmp);
+	(void)duplicate_read(file);
+	return file;
+}
+
+static void duplicate_free(struct duplicate_file **_file)
+{
+	struct duplicate_file *file = *_file;
+
+	*_file = NULL;
+	if (file->dotlock != NULL)
+		file_dotlock_delete(&file->dotlock);
+
+	hash_table_destroy(&file->hash);
+	pool_unref(&file->pool);
+}
+
+int duplicate_check(const void *id, size_t id_size, const char *user)
+{
+	struct duplicate d;
+
+	if (duplicate_file == NULL)
+		duplicate_file = duplicate_new(home_expand(DUPLICATE_PATH));
+
+	d.id = id;
+	d.id_size = id_size;
+	d.user = user;
+
+	return hash_table_lookup(duplicate_file->hash, &d) != NULL;
+}
+
+void duplicate_mark(const void *id, size_t id_size,
+                    const char *user, time_t timestamp)
+{
+	struct duplicate *d;
+	void *new_id;
+
+	if (duplicate_file == NULL)
+		duplicate_file = duplicate_new(home_expand(DUPLICATE_PATH));
+
+	new_id = p_malloc(duplicate_file->pool, id_size);
+	memcpy(new_id, id, id_size);
+
+	d = p_new(duplicate_file->pool, struct duplicate, 1);
+	d->id = new_id;
+	d->id_size = id_size;
+	d->user = p_strdup(duplicate_file->pool, user);
+	d->time = timestamp;
+
+	duplicate_file->changed = TRUE;
+	hash_table_insert(duplicate_file->hash, d, d);
+}
+
+void duplicate_flush(void)
+{
+	struct duplicate_file *file = duplicate_file;
+	struct duplicate_file_header hdr;
+	struct duplicate_record_header rec;
+	struct ostream *output;
+        struct hash_iterate_context *iter;
+	void *key, *value;
+
+	if (duplicate_file == NULL || !file->changed || file->new_fd == -1)
+		return;
+
+	memset(&hdr, 0, sizeof(hdr));
+	hdr.version = DUPLICATE_VERSION;
+
+	output = o_stream_create_fd_file(file->new_fd, 0, FALSE);
+	o_stream_send(output, &hdr, sizeof(hdr));
+
+	memset(&rec, 0, sizeof(rec));
+	iter = hash_table_iterate_init(file->hash);
+	while (hash_table_iterate(iter, &key, &value)) {
+		struct duplicate *d = value;
+
+		rec.stamp = d->time;
+		rec.id_size = d->id_size;
+		rec.user_size = strlen(d->user);
+
+		o_stream_send(output, &rec, sizeof(rec));
+		o_stream_send(output, d->id, rec.id_size);
+		o_stream_send(output, d->user, rec.user_size);
+	}
+	hash_table_iterate_deinit(&iter);
+	o_stream_unref(&output);
+
+	file->changed = FALSE;
+	if (file_dotlock_replace(&file->dotlock, 0) < 0)
+		i_error("file_dotlock_replace(%s) failed: %m", file->path);
+	file->new_fd = -1;
+}
+
+void duplicate_init(void)
+{
+	duplicate_dotlock_set.use_excl_lock =
+		getenv("DOTLOCK_USE_EXCL") != NULL;
+	duplicate_dotlock_set.nfs_flush =
+		getenv("MAIL_NFS_STORAGE") != NULL;
+}
+
+void duplicate_deinit(void)
+{
+	if (duplicate_file != NULL) {
+		duplicate_flush();
+		duplicate_free(&duplicate_file);
+	}
+}

=== removed file 'src/deliver/duplicate.c'
--- src/deliver/duplicate.c	2009-11-06 00:47:29 +0000
+++ src/deliver/duplicate.c	1970-01-01 00:00:00 +0000
@@ -1,324 +0,0 @@
-/* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "ioloop.h"
-#include "istream.h"
-#include "ostream.h"
-#include "home-expand.h"
-#include "file-dotlock.h"
-#include "hash.h"
-#include "duplicate.h"
-
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#define DUPLICATE_PATH "~/.dovecot.lda-dupes"
-#define COMPRESS_PERCENTAGE 10
-#define DUPLICATE_BUFSIZE 4096
-#define DUPLICATE_VERSION 2
-
-struct duplicate {
-	const void *id;
-	unsigned int id_size;
-
-	const char *user;
-	time_t time;
-};
-
-struct duplicate_file_header {
-	uint32_t version;
-};
-
-struct duplicate_record_header {
-	uint32_t stamp;
-	uint32_t id_size;
-	uint32_t user_size;
-};
-
-struct duplicate_file {
-	pool_t pool;
-	struct hash_table *hash;
-	const char *path;
-
-	int new_fd;
-	struct dotlock *dotlock;
-	unsigned int changed:1;
-};
-
-static struct dotlock_settings duplicate_dotlock_set = {
-	MEMBER(temp_prefix) NULL,
-	MEMBER(lock_suffix) NULL,
-
-	MEMBER(timeout) 20,
-	MEMBER(stale_timeout) 10,
-
-	MEMBER(callback) NULL,
-	MEMBER(context) NULL,
-
-	MEMBER(use_excl_lock) FALSE
-};
-static struct duplicate_file *duplicate_file = NULL;
-
-static int duplicate_cmp(const void *p1, const void *p2)
-{
-	const struct duplicate *d1 = p1, *d2 = p2;
-
-	return (d1->id_size == d2->id_size &&
-		memcmp(d1->id, d2->id, d1->id_size) == 0 &&
-		strcasecmp(d1->user, d2->user) == 0) ? 0 : 1;
-}
-
-static unsigned int duplicate_hash(const void *p)
-{
-	/* a char* hash function from ASU -- from glib */
-	const struct duplicate *d = p;
-        const unsigned char *s = d->id, *end = s + d->id_size;
-	unsigned int g, h = 0;
-
-	while (s != end) {
-		h = (h << 4) + *s;
-		if ((g = h & 0xf0000000UL)) {
-			h = h ^ (g >> 24);
-			h = h ^ g;
-		}
-		s++;
-	}
-
-	return h ^ strcase_hash(d->user);
-}
-
-static int
-duplicate_read_records(struct duplicate_file *file, struct istream *input,
-		       unsigned int record_size)
-{
-	const unsigned char *data;
-	struct duplicate_record_header hdr;
-	size_t size;
-	unsigned int change_count;
-
-	change_count = 0;
-	while (i_stream_read_data(input, &data, &size, record_size) > 0) {
-		if (record_size == sizeof(hdr))
-			memcpy(&hdr, data, sizeof(hdr));
-		else {
-			/* FIXME: backwards compatibility with v1.0 */
-			time_t stamp;
-
-			i_assert(record_size ==
-				 sizeof(time_t) + sizeof(uint32_t)*2);
-			memcpy(&stamp, data, sizeof(stamp));
-			hdr.stamp = stamp;
-			memcpy(&hdr.id_size, data + sizeof(time_t),
-			       sizeof(hdr.id_size));
-			memcpy(&hdr.user_size,
-			       data + sizeof(time_t) + sizeof(uint32_t),
-			       sizeof(hdr.user_size));
-		}
-		i_stream_skip(input, record_size);
-
-		if (hdr.id_size == 0 || hdr.user_size == 0 ||
-		    hdr.id_size > DUPLICATE_BUFSIZE ||
-		    hdr.user_size > DUPLICATE_BUFSIZE) {
-			i_error("broken duplicate file %s", file->path);
-			return -1;
-		}
-
-		if (i_stream_read_data(input, &data, &size,
-				       hdr.id_size + hdr.user_size - 1) <= 0) {
-			i_error("unexpected end of file in %s", file->path);
-			return -1;
-		}
-
-		if ((time_t)hdr.stamp >= ioloop_time) {
-			/* still valid, save it */
-			struct duplicate *d;
-			void *new_id;
-
-			new_id = p_malloc(file->pool, hdr.id_size);
-			memcpy(new_id, data, hdr.id_size);
-
-			d = p_new(file->pool, struct duplicate, 1);
-			d->id = new_id;
-			d->id_size = hdr.id_size;
-			d->user = p_strndup(file->pool,
-					    data + hdr.id_size, hdr.user_size);
-			d->time = hdr.stamp;
-			hash_table_insert(file->hash, d, d);
-		} else {
-                        change_count++;
-		}
-		i_stream_skip(input, hdr.id_size + hdr.user_size);
-	}
-
-	if (hash_table_count(file->hash) *
-	    COMPRESS_PERCENTAGE / 100 > change_count)
-		file->changed = TRUE;
-	return 0;
-}
-
-static int duplicate_read(struct duplicate_file *file)
-{
-	struct istream *input;
-	struct duplicate_file_header hdr;
-	const unsigned char *data;
-	size_t size;
-	int fd;
-	unsigned int record_size = 0;
-
-	fd = open(file->path, O_RDONLY);
-	if (fd == -1) {
-		if (errno == ENOENT)
-			return 0;
-		i_error("open(%s) failed: %m", file->path);
-		return -1;
-	}
-
-	/* <timestamp> <id_size> <user_size> <id> <user> */
-	input = i_stream_create_fd(fd, DUPLICATE_BUFSIZE, FALSE);
-	if (i_stream_read_data(input, &data, &size, sizeof(hdr)) > 0) {
-		memcpy(&hdr, data, sizeof(hdr));
-		if (hdr.version == 0 || hdr.version > DUPLICATE_VERSION + 10) {
-			/* FIXME: backwards compatibility with v1.0 */
-			record_size = sizeof(time_t) + sizeof(uint32_t)*2;
-		} else if (hdr.version == DUPLICATE_VERSION) {
-			record_size = sizeof(struct duplicate_record_header);
-			i_stream_skip(input, sizeof(hdr));
-		}
-	}
-
-	if (record_size == 0 ||
-	    duplicate_read_records(file, input, record_size) < 0) {
-		if (unlink(file->path) < 0 && errno != ENOENT)
-			i_error("unlink(%s) failed: %m", file->path);
-	}
-
-	i_stream_unref(&input);
-	if (close(fd) < 0)
-		i_error("close(%s) failed: %m", file->path);
-	return 0;
-}
-
-static struct duplicate_file *duplicate_new(const char *path)
-{
-	struct duplicate_file *file;
-	pool_t pool;
-
-	pool = pool_alloconly_create("duplicates", 10240);
-
-	file = p_new(pool, struct duplicate_file, 1);
-	file->pool = pool;
-	file->path = p_strdup(pool, path);
-	file->new_fd = file_dotlock_open(&duplicate_dotlock_set, path, 0,
-					 &file->dotlock);
-	if (file->new_fd == -1)
-		i_error("file_dotlock_create(%s) failed: %m", path);
-	file->hash = hash_table_create(default_pool, pool, 0,
-				       duplicate_hash, duplicate_cmp);
-	(void)duplicate_read(file);
-	return file;
-}
-
-static void duplicate_free(struct duplicate_file **_file)
-{
-	struct duplicate_file *file = *_file;
-
-	*_file = NULL;
-	if (file->dotlock != NULL)
-		file_dotlock_delete(&file->dotlock);
-
-	hash_table_destroy(&file->hash);
-	pool_unref(&file->pool);
-}
-
-int duplicate_check(const void *id, size_t id_size, const char *user)
-{
-	struct duplicate d;
-
-	if (duplicate_file == NULL)
-		duplicate_file = duplicate_new(home_expand(DUPLICATE_PATH));
-
-	d.id = id;
-	d.id_size = id_size;
-	d.user = user;
-
-	return hash_table_lookup(duplicate_file->hash, &d) != NULL;
-}
-
-void duplicate_mark(const void *id, size_t id_size,
-                    const char *user, time_t timestamp)
-{
-	struct duplicate *d;
-	void *new_id;
-
-	if (duplicate_file == NULL)
-		duplicate_file = duplicate_new(home_expand(DUPLICATE_PATH));
-
-	new_id = p_malloc(duplicate_file->pool, id_size);
-	memcpy(new_id, id, id_size);
-
-	d = p_new(duplicate_file->pool, struct duplicate, 1);
-	d->id = new_id;
-	d->id_size = id_size;
-	d->user = p_strdup(duplicate_file->pool, user);
-	d->time = timestamp;
-
-	duplicate_file->changed = TRUE;
-	hash_table_insert(duplicate_file->hash, d, d);
-}
-
-void duplicate_flush(void)
-{
-	struct duplicate_file *file = duplicate_file;
-	struct duplicate_file_header hdr;
-	struct duplicate_record_header rec;
-	struct ostream *output;
-        struct hash_iterate_context *iter;
-	void *key, *value;
-
-	if (duplicate_file == NULL || !file->changed || file->new_fd == -1)
-		return;
-
-	memset(&hdr, 0, sizeof(hdr));
-	hdr.version = DUPLICATE_VERSION;
-
-	output = o_stream_create_fd_file(file->new_fd, 0, FALSE);
-	o_stream_send(output, &hdr, sizeof(hdr));
-
-	memset(&rec, 0, sizeof(rec));
-	iter = hash_table_iterate_init(file->hash);
-	while (hash_table_iterate(iter, &key, &value)) {
-		struct duplicate *d = value;
-
-		rec.stamp = d->time;
-		rec.id_size = d->id_size;
-		rec.user_size = strlen(d->user);
-
-		o_stream_send(output, &rec, sizeof(rec));
-		o_stream_send(output, d->id, rec.id_size);
-		o_stream_send(output, d->user, rec.user_size);
-	}
-	hash_table_iterate_deinit(&iter);
-	o_stream_unref(&output);
-
-	file->changed = FALSE;
-	if (file_dotlock_replace(&file->dotlock, 0) < 0)
-		i_error("file_dotlock_replace(%s) failed: %m", file->path);
-	file->new_fd = -1;
-}
-
-void duplicate_init(void)
-{
-	duplicate_dotlock_set.use_excl_lock =
-		getenv("DOTLOCK_USE_EXCL") != NULL;
-	duplicate_dotlock_set.nfs_flush =
-		getenv("MAIL_NFS_STORAGE") != NULL;
-}
-
-void duplicate_deinit(void)
-{
-	if (duplicate_file != NULL) {
-		duplicate_flush();
-		duplicate_free(&duplicate_file);
-	}
-}

=== added file 'src/deliver/duplicate.h'
--- src/deliver/duplicate.h	1970-01-01 00:00:00 +0000
+++ src/deliver/duplicate.h	2010-02-13 00:05:29 +0000
@@ -0,0 +1,15 @@
+#ifndef DUPLICATE_H
+#define DUPLICATE_H
+
+#define DUPLICATE_DEFAULT_KEEP (3600 * 24)
+
+int duplicate_check(const void *id, size_t id_size, const char *user);
+void duplicate_mark(const void *id, size_t id_size,
+                    const char *user, time_t timestamp);
+
+void duplicate_flush(void);
+
+void duplicate_init(void);
+void duplicate_deinit(void);
+
+#endif

=== removed file 'src/deliver/duplicate.h'
--- src/deliver/duplicate.h	2009-11-06 00:47:29 +0000
+++ src/deliver/duplicate.h	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#ifndef DUPLICATE_H
-#define DUPLICATE_H
-
-#define DUPLICATE_DEFAULT_KEEP (3600 * 24)
-
-int duplicate_check(const void *id, size_t id_size, const char *user);
-void duplicate_mark(const void *id, size_t id_size,
-                    const char *user, time_t timestamp);
-
-void duplicate_flush(void);
-
-void duplicate_init(void);
-void duplicate_deinit(void);
-
-#endif

=== added file 'src/deliver/mail-send.c'
--- src/deliver/mail-send.c	1970-01-01 00:00:00 +0000
+++ src/deliver/mail-send.c	2010-02-13 00:05:29 +0000
@@ -0,0 +1,208 @@
+/* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "ioloop.h"
+#include "hostpid.h"
+#include "istream.h"
+#include "str.h"
+#include "str-sanitize.h"
+#include "var-expand.h"
+#include "message-date.h"
+#include "message-size.h"
+#include "duplicate.h"
+#include "istream-header-filter.h"
+#include "smtp-client.h"
+#include "deliver.h"
+#include "mail-send.h"
+
+#include <stdlib.h>
+#include <sys/wait.h>
+
+int global_outgoing_count = 0;
+
+static const struct var_expand_table *
+get_var_expand_table(struct mail *mail, const char *reason,
+		     const char *recipient)
+{
+	static struct var_expand_table static_tab[] = {
+		{ 'n', NULL, "crlf" },
+		{ 'r', NULL, "reason" },
+		{ 's', NULL, "subject" },
+		{ 't', NULL, "to" },
+		{ '\0', NULL, NULL }
+	};
+	struct var_expand_table *tab;
+	const char *subject;
+
+	tab = t_malloc(sizeof(static_tab));
+	memcpy(tab, static_tab, sizeof(static_tab));
+
+	tab[0].value = "\r\n";
+	tab[1].value = reason;
+	if (mail_get_first_header(mail, "Subject", &subject) <= 0)
+		subject = "";
+	tab[2].value = str_sanitize(subject, 80);
+	tab[3].value = recipient;
+
+	return tab;
+}
+
+int mail_send_rejection(struct mail *mail, const char *recipient,
+			const char *reason)
+{
+    struct istream *input;
+    struct smtp_client *smtp_client;
+    FILE *f;
+    struct message_size hdr_size;
+    const char *return_addr, *hdr;
+    const unsigned char *data;
+    const char *value, *msgid, *orig_msgid, *boundary;
+    string_t *str;
+    size_t size;
+    int ret;
+
+    if (mail_get_first_header(mail, "Auto-Submitted", &value) > 0 &&
+	strcasecmp(value, "no") != 0) {
+	    i_info("msgid=%s: Auto-submitted message discarded: %s",
+		   orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
+		   str_sanitize(reason, 512));
+	    return 0;
+    }
+
+    if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
+	    orig_msgid = NULL;
+    return_addr = deliver_get_return_address(mail);
+    if (return_addr == NULL) {
+	    i_info("msgid=%s: Return-Path missing, rejection reason: %s",
+		   orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
+		   str_sanitize(reason, 512));
+	    return 0;
+    }
+
+    if (getenv("DEBUG") != NULL) {
+	    i_info("Sending a rejection to %s: %s", recipient,
+		   str_sanitize(reason, 512));
+    }
+
+    smtp_client = smtp_client_open(return_addr, NULL, &f);
+
+    msgid = deliver_get_new_message_id();
+    boundary = t_strdup_printf("%s/%s", my_pid, deliver_set->hostname);
+
+    fprintf(f, "Message-ID: %s\r\n", msgid);
+    fprintf(f, "Date: %s\r\n", message_date_create(ioloop_time));
+    fprintf(f, "From: Mail Delivery Subsystem <%s>\r\n",
+	    deliver_set->postmaster_address);
+    fprintf(f, "To: <%s>\r\n", return_addr);
+    fprintf(f, "MIME-Version: 1.0\r\n");
+    fprintf(f, "Content-Type: "
+	    "multipart/report; report-type=disposition-notification;\r\n"
+	    "\tboundary=\"%s\"\r\n", boundary);
+
+    str = t_str_new(256);
+    var_expand(str, deliver_set->rejection_subject,
+	       get_var_expand_table(mail, reason, recipient));
+    fprintf(f, "Subject: %s\r\n", str_c(str));
+
+    fprintf(f, "Auto-Submitted: auto-replied (rejected)\r\n");
+    fprintf(f, "Precedence: bulk\r\n");
+    fprintf(f, "\r\nThis is a MIME-encapsulated message\r\n\r\n");
+
+    /* human readable status report */
+    fprintf(f, "--%s\r\n", boundary);
+    fprintf(f, "Content-Type: text/plain; charset=utf-8\r\n");
+    fprintf(f, "Content-Disposition: inline\r\n");
+    fprintf(f, "Content-Transfer-Encoding: 8bit\r\n\r\n");
+
+    str_truncate(str, 0);
+    var_expand(str, deliver_set->rejection_reason,
+	       get_var_expand_table(mail, reason, recipient));
+    fprintf(f, "%s\r\n", str_c(str));
+
+    /* MDN status report */
+    fprintf(f, "--%s\r\n"
+	    "Content-Type: message/disposition-notification\r\n\r\n",
+	    boundary);
+    fprintf(f, "Reporting-UA: %s; Dovecot Mail Delivery Agent\r\n",
+	    deliver_set->hostname);
+    if (mail_get_first_header(mail, "Original-Recipient", &hdr) > 0)
+	    fprintf(f, "Original-Recipient: rfc822; %s\r\n", hdr);
+    fprintf(f, "Final-Recipient: rfc822; %s\r\n", recipient);
+
+    if (orig_msgid != NULL)
+	fprintf(f, "Original-Message-ID: %s\r\n", orig_msgid);
+    fprintf(f, "Disposition: "
+	    "automatic-action/MDN-sent-automatically; deleted\r\n");
+    fprintf(f, "\r\n");
+
+    /* original message's headers */
+    fprintf(f, "--%s\r\nContent-Type: message/rfc822\r\n\r\n", boundary);
+
+    if (mail_get_stream(mail, &hdr_size, NULL, &input) == 0) {
+	    /* Note: If you add more headers, they need to be sorted.
+	       We'll drop Content-Type because we're not including the message
+	       body, and having a multipart Content-Type may confuse some
+	       MIME parsers when they don't see the message boundaries. */
+	    static const char *const exclude_headers[] = {
+		    "Content-Type"
+	    };
+
+	    input = i_stream_create_header_filter(input,
+	    		HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR |
+			HEADER_FILTER_HIDE_BODY, exclude_headers,
+			N_ELEMENTS(exclude_headers),
+			null_header_filter_callback, NULL);
+
+	    while ((ret = i_stream_read_data(input, &data, &size, 0)) > 0) {
+		    if (fwrite(data, size, 1, f) == 0)
+			    break;
+		    i_stream_skip(input, size);
+	    }
+	    i_stream_unref(&input);
+
+	    i_assert(ret != 0);
+    }
+
+    fprintf(f, "\r\n\r\n--%s--\r\n", boundary);
+    return smtp_client_close(smtp_client);
+}
+
+int mail_send_forward(struct mail *mail, const char *forwardto)
+{
+    static const char *hide_headers[] = {
+        "Return-Path"
+    };
+    struct istream *input;
+    struct smtp_client *smtp_client;
+    FILE *f;
+    const unsigned char *data;
+    const char *return_path;
+    size_t size;
+    int ret;
+
+    if (mail_get_stream(mail, NULL, NULL, &input) < 0)
+	    return -1;
+
+    return_path = deliver_get_return_address(mail);
+    if (getenv("DEBUG") != NULL) {
+	    i_info("Sending a forward to <%s> with return path <%s>",
+		   forwardto, return_path);
+    }
+
+    smtp_client = smtp_client_open(forwardto, return_path, &f);
+
+    input = i_stream_create_header_filter(input, HEADER_FILTER_EXCLUDE |
+                                          HEADER_FILTER_NO_CR, hide_headers,
+                                          N_ELEMENTS(hide_headers),
+					  null_header_filter_callback, NULL);
+
+    while ((ret = i_stream_read_data(input, &data, &size, 0)) > 0) {
+	    if (fwrite(data, size, 1, f) == 0)
+		    break;
+	    i_stream_skip(input, size);
+    }
+    i_stream_unref(&input);
+
+    return smtp_client_close(smtp_client);
+}
+

=== removed file 'src/deliver/mail-send.c'
--- src/deliver/mail-send.c	2009-11-06 00:47:29 +0000
+++ src/deliver/mail-send.c	1970-01-01 00:00:00 +0000
@@ -1,208 +0,0 @@
-/* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "ioloop.h"
-#include "hostpid.h"
-#include "istream.h"
-#include "str.h"
-#include "str-sanitize.h"
-#include "var-expand.h"
-#include "message-date.h"
-#include "message-size.h"
-#include "duplicate.h"
-#include "istream-header-filter.h"
-#include "smtp-client.h"
-#include "deliver.h"
-#include "mail-send.h"
-
-#include <stdlib.h>
-#include <sys/wait.h>
-
-int global_outgoing_count = 0;
-
-static const struct var_expand_table *
-get_var_expand_table(struct mail *mail, const char *reason,
-		     const char *recipient)
-{
-	static struct var_expand_table static_tab[] = {
-		{ 'n', NULL, "crlf" },
-		{ 'r', NULL, "reason" },
-		{ 's', NULL, "subject" },
-		{ 't', NULL, "to" },
-		{ '\0', NULL, NULL }
-	};
-	struct var_expand_table *tab;
-	const char *subject;
-
-	tab = t_malloc(sizeof(static_tab));
-	memcpy(tab, static_tab, sizeof(static_tab));
-
-	tab[0].value = "\r\n";
-	tab[1].value = reason;
-	if (mail_get_first_header(mail, "Subject", &subject) <= 0)
-		subject = "";
-	tab[2].value = str_sanitize(subject, 80);
-	tab[3].value = recipient;
-
-	return tab;
-}
-
-int mail_send_rejection(struct mail *mail, const char *recipient,
-			const char *reason)
-{
-    struct istream *input;
-    struct smtp_client *smtp_client;
-    FILE *f;
-    struct message_size hdr_size;
-    const char *return_addr, *hdr;
-    const unsigned char *data;
-    const char *value, *msgid, *orig_msgid, *boundary;
-    string_t *str;
-    size_t size;
-    int ret;
-
-    if (mail_get_first_header(mail, "Auto-Submitted", &value) > 0 &&
-	strcasecmp(value, "no") != 0) {
-	    i_info("msgid=%s: Auto-submitted message discarded: %s",
-		   orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
-		   str_sanitize(reason, 512));
-	    return 0;
-    }
-
-    if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
-	    orig_msgid = NULL;
-    return_addr = deliver_get_return_address(mail);
-    if (return_addr == NULL) {
-	    i_info("msgid=%s: Return-Path missing, rejection reason: %s",
-		   orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
-		   str_sanitize(reason, 512));
-	    return 0;
-    }
-
-    if (getenv("DEBUG") != NULL) {
-	    i_info("Sending a rejection to %s: %s", recipient,
-		   str_sanitize(reason, 512));
-    }
-
-    smtp_client = smtp_client_open(return_addr, NULL, &f);
-
-    msgid = deliver_get_new_message_id();
-    boundary = t_strdup_printf("%s/%s", my_pid, deliver_set->hostname);
-
-    fprintf(f, "Message-ID: %s\r\n", msgid);
-    fprintf(f, "Date: %s\r\n", message_date_create(ioloop_time));
-    fprintf(f, "From: Mail Delivery Subsystem <%s>\r\n",
-	    deliver_set->postmaster_address);
-    fprintf(f, "To: <%s>\r\n", return_addr);
-    fprintf(f, "MIME-Version: 1.0\r\n");
-    fprintf(f, "Content-Type: "
-	    "multipart/report; report-type=disposition-notification;\r\n"
-	    "\tboundary=\"%s\"\r\n", boundary);
-
-    str = t_str_new(256);
-    var_expand(str, deliver_set->rejection_subject,
-	       get_var_expand_table(mail, reason, recipient));
-    fprintf(f, "Subject: %s\r\n", str_c(str));
-
-    fprintf(f, "Auto-Submitted: auto-replied (rejected)\r\n");
-    fprintf(f, "Precedence: bulk\r\n");
-    fprintf(f, "\r\nThis is a MIME-encapsulated message\r\n\r\n");
-
-    /* human readable status report */
-    fprintf(f, "--%s\r\n", boundary);
-    fprintf(f, "Content-Type: text/plain; charset=utf-8\r\n");
-    fprintf(f, "Content-Disposition: inline\r\n");
-    fprintf(f, "Content-Transfer-Encoding: 8bit\r\n\r\n");
-
-    str_truncate(str, 0);
-    var_expand(str, deliver_set->rejection_reason,
-	       get_var_expand_table(mail, reason, recipient));
-    fprintf(f, "%s\r\n", str_c(str));
-
-    /* MDN status report */
-    fprintf(f, "--%s\r\n"
-	    "Content-Type: message/disposition-notification\r\n\r\n",
-	    boundary);
-    fprintf(f, "Reporting-UA: %s; Dovecot Mail Delivery Agent\r\n",
-	    deliver_set->hostname);
-    if (mail_get_first_header(mail, "Original-Recipient", &hdr) > 0)
-	    fprintf(f, "Original-Recipient: rfc822; %s\r\n", hdr);
-    fprintf(f, "Final-Recipient: rfc822; %s\r\n", recipient);
-
-    if (orig_msgid != NULL)
-	fprintf(f, "Original-Message-ID: %s\r\n", orig_msgid);
-    fprintf(f, "Disposition: "
-	    "automatic-action/MDN-sent-automatically; deleted\r\n");
-    fprintf(f, "\r\n");
-
-    /* original message's headers */
-    fprintf(f, "--%s\r\nContent-Type: message/rfc822\r\n\r\n", boundary);
-
-    if (mail_get_stream(mail, &hdr_size, NULL, &input) == 0) {
-	    /* Note: If you add more headers, they need to be sorted.
-	       We'll drop Content-Type because we're not including the message
-	       body, and having a multipart Content-Type may confuse some
-	       MIME parsers when they don't see the message boundaries. */
-	    static const char *const exclude_headers[] = {
-		    "Content-Type"
-	    };
-
-	    input = i_stream_create_header_filter(input,
-	    		HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR |
-			HEADER_FILTER_HIDE_BODY, exclude_headers,
-			N_ELEMENTS(exclude_headers),
-			null_header_filter_callback, NULL);
-
-	    while ((ret = i_stream_read_data(input, &data, &size, 0)) > 0) {
-		    if (fwrite(data, size, 1, f) == 0)
-			    break;
-		    i_stream_skip(input, size);
-	    }
-	    i_stream_unref(&input);
-
-	    i_assert(ret != 0);
-    }
-
-    fprintf(f, "\r\n\r\n--%s--\r\n", boundary);
-    return smtp_client_close(smtp_client);
-}
-
-int mail_send_forward(struct mail *mail, const char *forwardto)
-{
-    static const char *hide_headers[] = {
-        "Return-Path"
-    };
-    struct istream *input;
-    struct smtp_client *smtp_client;
-    FILE *f;
-    const unsigned char *data;
-    const char *return_path;
-    size_t size;
-    int ret;
-
-    if (mail_get_stream(mail, NULL, NULL, &input) < 0)
-	    return -1;
-
-    return_path = deliver_get_return_address(mail);
-    if (getenv("DEBUG") != NULL) {
-	    i_info("Sending a forward to <%s> with return path <%s>",
-		   forwardto, return_path);
-    }
-
-    smtp_client = smtp_client_open(forwardto, return_path, &f);
-
-    input = i_stream_create_header_filter(input, HEADER_FILTER_EXCLUDE |
-                                          HEADER_FILTER_NO_CR, hide_headers,
-                                          N_ELEMENTS(hide_headers),
-					  null_header_filter_callback, NULL);
-
-    while ((ret = i_stream_read_data(input, &data, &size, 0)) > 0) {
-	    if (fwrite(data, size, 1, f) == 0)
-		    break;
-	    i_stream_skip(input, size);
-    }
-    i_stream_unref(&input);
-
-    return smtp_client_close(smtp_client);
-}
-

=== added file 'src/deliver/mail-send.h'
--- src/deliver/mail-send.h	1970-01-01 00:00:00 +0000
+++ src/deliver/mail-send.h	2010-02-13 00:05:29 +0000
@@ -0,0 +1,10 @@
+#ifndef MAIL_SEND_H
+#define MAIL_SEND_H
+
+struct mail;
+
+int mail_send_rejection(struct mail *mail, const char *recipient,
+			const char *reason);
+int mail_send_forward(struct mail *mail, const char *forwardto);
+
+#endif

=== removed file 'src/deliver/mail-send.h'
--- src/deliver/mail-send.h	2009-11-06 00:47:29 +0000
+++ src/deliver/mail-send.h	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#ifndef MAIL_SEND_H
-#define MAIL_SEND_H
-
-struct mail;
-
-int mail_send_rejection(struct mail *mail, const char *recipient,
-			const char *reason);
-int mail_send_forward(struct mail *mail, const char *forwardto);
-
-#endif

=== added file 'src/deliver/smtp-client.c'
--- src/deliver/smtp-client.c	1970-01-01 00:00:00 +0000
+++ src/deliver/smtp-client.c	2010-02-13 00:05:29 +0000
@@ -0,0 +1,114 @@
+/* Copyright (c) 2006-2009 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "deliver.h"
+#include "smtp-client.h"
+
+#include <unistd.h>
+#include <sys/wait.h>
+
+struct smtp_client {
+	FILE *f;
+	pid_t pid;
+};
+
+static struct smtp_client *smtp_client_devnull(FILE **file_r)
+{
+	struct smtp_client *client;
+
+	client = i_new(struct smtp_client, 1);
+	client->f = *file_r = fopen("/dev/null", "w");
+	if (client->f == NULL)
+		i_fatal("fopen() failed: %m");
+	client->pid = (pid_t)-1;
+	return client;
+}
+
+static void ATTR_NORETURN
+smtp_client_run_sendmail(const char *destination,
+			 const char *return_path, int fd)
+{
+	const char *argv[7], *sendmail_path;
+
+	/* deliver_set's contents may point to environment variables.
+	   deliver_env_clean() cleans them up, so they have to be copied. */
+	sendmail_path = t_strdup(deliver_set->sendmail_path);
+
+	argv[0] = sendmail_path;
+	argv[1] = "-i"; /* ignore dots */
+	argv[2] = "-f";
+	argv[3] = return_path != NULL && *return_path != '\0' ?
+		return_path : "<>";
+	argv[4] = "--";
+	argv[5] = destination;
+	argv[6] = NULL;
+
+	if (dup2(fd, STDIN_FILENO) < 0)
+		i_fatal("dup2() failed: %m");
+
+	deliver_env_clean(TRUE);
+
+	(void)execv(sendmail_path, (void *)argv);
+	i_fatal("execv(%s) failed: %m", sendmail_path);
+}
+
+struct smtp_client *smtp_client_open(const char *destination,
+				     const char *return_path, FILE **file_r)
+{
+	struct smtp_client *client;
+	int fd[2];
+	pid_t pid;
+
+	if (pipe(fd) < 0) {
+		i_error("pipe() failed: %m");
+		return smtp_client_devnull(file_r);
+	}
+
+	if ((pid = fork()) == (pid_t)-1) {
+		i_error("fork() failed: %m");
+		(void)close(fd[0]); (void)close(fd[1]);
+		return smtp_client_devnull(file_r);
+	}
+	if (pid == 0) {
+		/* child */
+		(void)close(fd[1]);
+		smtp_client_run_sendmail(destination, return_path, fd[0]);
+	}
+	(void)close(fd[0]);
+
+	client = i_new(struct smtp_client, 1);
+	client->f = *file_r = fdopen(fd[1], "w");
+	if (client->f == NULL)
+		i_fatal("fdopen() failed: %m");
+	return client;
+}
+
+int smtp_client_close(struct smtp_client *client)
+{
+	int ret = EX_TEMPFAIL, status;
+
+	fclose(client->f);
+	if (client->pid == (pid_t)-1) {
+		/* smtp_client_open() failed already */
+	} else if (waitpid(client->pid, &status, 0) < 0)
+		i_error("waitpid() failed: %m");
+	else if (WIFEXITED(status)) {
+		ret = WEXITSTATUS(status);
+		if (ret != 0) {
+			i_error("Sendmail process terminated abnormally, "
+				"exit status %d", ret);
+		}
+	} else if (WIFSIGNALED(status)) {
+		i_error("Sendmail process terminated abnormally, "
+				"signal %d", WTERMSIG(status));
+	} else if (WIFSTOPPED(status)) {
+		i_error("Sendmail process stopped, signal %d",
+			WSTOPSIG(status));
+	} else {
+		i_error("Sendmail process terminated abnormally, "
+			"return status %d", status);
+	}
+
+	i_free(client);
+	return ret;
+}

=== removed file 'src/deliver/smtp-client.c'
--- src/deliver/smtp-client.c	2009-11-06 00:47:29 +0000
+++ src/deliver/smtp-client.c	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-/* Copyright (c) 2006-2009 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "deliver.h"
-#include "smtp-client.h"
-
-#include <unistd.h>
-#include <sys/wait.h>
-
-struct smtp_client {
-	FILE *f;
-	pid_t pid;
-};
-
-static struct smtp_client *smtp_client_devnull(FILE **file_r)
-{
-	struct smtp_client *client;
-
-	client = i_new(struct smtp_client, 1);
-	client->f = *file_r = fopen("/dev/null", "w");
-	if (client->f == NULL)
-		i_fatal("fopen() failed: %m");
-	client->pid = (pid_t)-1;
-	return client;
-}
-
-static void ATTR_NORETURN
-smtp_client_run_sendmail(const char *destination,
-			 const char *return_path, int fd)
-{
-	const char *argv[7], *sendmail_path;
-
-	/* deliver_set's contents may point to environment variables.
-	   deliver_env_clean() cleans them up, so they have to be copied. */
-	sendmail_path = t_strdup(deliver_set->sendmail_path);
-
-	argv[0] = sendmail_path;
-	argv[1] = "-i"; /* ignore dots */
-	argv[2] = "-f";
-	argv[3] = return_path != NULL && *return_path != '\0' ?
-		return_path : "<>";
-	argv[4] = "--";
-	argv[5] = destination;
-	argv[6] = NULL;
-
-	if (dup2(fd, STDIN_FILENO) < 0)
-		i_fatal("dup2() failed: %m");
-
-	deliver_env_clean(TRUE);
-
-	(void)execv(sendmail_path, (void *)argv);
-	i_fatal("execv(%s) failed: %m", sendmail_path);
-}
-
-struct smtp_client *smtp_client_open(const char *destination,
-				     const char *return_path, FILE **file_r)
-{
-	struct smtp_client *client;
-	int fd[2];
-	pid_t pid;
-
-	if (pipe(fd) < 0) {
-		i_error("pipe() failed: %m");
-		return smtp_client_devnull(file_r);
-	}
-
-	if ((pid = fork()) == (pid_t)-1) {
-		i_error("fork() failed: %m");
-		(void)close(fd[0]); (void)close(fd[1]);
-		return smtp_client_devnull(file_r);
-	}
-	if (pid == 0) {
-		/* child */
-		(void)close(fd[1]);
-		smtp_client_run_sendmail(destination, return_path, fd[0]);
-	}
-	(void)close(fd[0]);
-
-	client = i_new(struct smtp_client, 1);
-	client->f = *file_r = fdopen(fd[1], "w");
-	if (client->f == NULL)
-		i_fatal("fdopen() failed: %m");
-	return client;
-}
-
-int smtp_client_close(struct smtp_client *client)
-{
-	int ret = EX_TEMPFAIL, status;
-
-	fclose(client->f);
-	if (client->pid == (pid_t)-1) {
-		/* smtp_client_open() failed already */
-	} else if (waitpid(client->pid, &status, 0) < 0)
-		i_error("waitpid() failed: %m");
-	else if (WIFEXITED(status)) {
-		ret = WEXITSTATUS(status);
-		if (ret != 0) {
-			i_error("Sendmail process terminated abnormally, "
-				"exit status %d", ret);
-		}
-	} else if (WIFSIGNALED(status)) {
-		i_error("Sendmail process terminated abnormally, "
-				"signal %d", WTERMSIG(status));
-	} else if (WIFSTOPPED(status)) {
-		i_error("Sendmail process stopped, signal %d",
-			WSTOPSIG(status));
-	} else {
-		i_error("Sendmail process terminated abnormally, "
-			"return status %d", status);
-	}
-
-	i_free(client);
-	return ret;
-}

=== added file 'src/deliver/smtp-client.h'
--- src/deliver/smtp-client.h	1970-01-01 00:00:00 +0000
+++ src/deliver/smtp-client.h	2010-02-13 00:05:29 +0000
@@ -0,0 +1,11 @@
+#ifndef SMTP_CLIENT_H
+#define SMTP_CLIENT_H
+
+#include <stdio.h>
+
+struct smtp_client *smtp_client_open(const char *destination,
+				     const char *return_path, FILE **file_r);
+/* Returns sysexits-compatible return value */
+int smtp_client_close(struct smtp_client *client);
+
+#endif

=== removed file 'src/deliver/smtp-client.h'
--- src/deliver/smtp-client.h	2009-11-06 00:47:29 +0000
+++ src/deliver/smtp-client.h	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#ifndef SMTP_CLIENT_H
-#define SMTP_CLIENT_H
-
-#include <stdio.h>
-
-struct smtp_client *smtp_client_open(const char *destination,
-				     const char *return_path, FILE **file_r);
-/* Returns sysexits-compatible return value */
-int smtp_client_close(struct smtp_client *client);
-
-#endif