Adding upstream version 1:2.3.21+dfsg1.upstream/1%2.3.21+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

10 files changed, 4431 insertions, 0 deletions

diff --git a/src/lib-program-client/Makefile.am b/src/lib-program-client/Makefile.am
new file mode 100644
index 0000000..4198606
--- /dev/null
+++ b/src/lib-program-client/Makefile.am
@@ -0,0 +1,55 @@
+noinst_LTLIBRARIES = libprogram_client.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/lib-test \
+	-I$(top_srcdir)/src/lib-dns \
+	-I$(top_srcdir)/src/lib-mail
+
+libprogram_client_la_SOURCES = \
+	program-client.c \
+	program-client-local.c \
+	program-client-remote.c
+
+headers = \
+	program-client.h
+
+noinst_HEADERS = \
+	program-client-private.h
+
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
+
+test_programs = \
+	test-program-client-local \
+	test-program-client-unix \
+	test-program-client-net
+
+noinst_PROGRAMS = $(test_programs)
+
+test_libs = \
+	libprogram_client.la \
+	../lib-dns/libdns.la  \
+	../lib-test/libtest.la \
+	../lib-mail/libmail.la \
+	../lib-charset/libcharset.la \
+	../lib/liblib.la \
+	$(MODULE_LIBS)
+
+test_program_client_local_SOURCE = test-program-client-local.c
+test_program_client_local_LDADD = $(test_libs)
+
+test_program_client_unix_SOURCE = test-program-client-unix.c
+test_program_client_unix_LDADD = $(test_libs)
+
+test_program_client_net_SOURCE = test-program-client-net.c
+test_program_client_net_LDADD = $(test_libs)
+
+check-local:
+	for bin in $(test_programs); do \
+	  if test "$$bin" = "test-program-client-local"; then \
+	    if ! env NOCHILDREN=yes $(RUN_TEST) ./$$bin; then exit 1; fi; \
+          else \
+	    if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+	  fi \
+	done
diff --git a/src/lib-program-client/Makefile.in b/src/lib-program-client/Makefile.in
new file mode 100644
index 0000000..7fdc17d
--- /dev/null
+++ b/src/lib-program-client/Makefile.in
@@ -0,0 +1,912 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 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@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@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@
+noinst_PROGRAMS = $(am__EXEEXT_1)
+subdir = src/lib-program-client
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_checktype2.m4 \
+	$(top_srcdir)/m4/ac_typeof.m4 $(top_srcdir)/m4/arc4random.m4 \
+	$(top_srcdir)/m4/blockdev.m4 $(top_srcdir)/m4/c99_vsnprintf.m4 \
+	$(top_srcdir)/m4/clock_gettime.m4 $(top_srcdir)/m4/crypt.m4 \
+	$(top_srcdir)/m4/crypt_xpg6.m4 $(top_srcdir)/m4/dbqlk.m4 \
+	$(top_srcdir)/m4/dirent_dtype.m4 $(top_srcdir)/m4/dovecot.m4 \
+	$(top_srcdir)/m4/fd_passing.m4 $(top_srcdir)/m4/fdatasync.m4 \
+	$(top_srcdir)/m4/flexible_array_member.m4 \
+	$(top_srcdir)/m4/glibc.m4 $(top_srcdir)/m4/gmtime_max.m4 \
+	$(top_srcdir)/m4/gmtime_tm_gmtoff.m4 \
+	$(top_srcdir)/m4/ioloop.m4 $(top_srcdir)/m4/iovec.m4 \
+	$(top_srcdir)/m4/ipv6.m4 $(top_srcdir)/m4/libcap.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwrap.m4 \
+	$(top_srcdir)/m4/linux_mremap.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mmap_write.m4 \
+	$(top_srcdir)/m4/mntctl.m4 $(top_srcdir)/m4/modules.m4 \
+	$(top_srcdir)/m4/notify.m4 $(top_srcdir)/m4/nsl.m4 \
+	$(top_srcdir)/m4/off_t_max.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/m4/pr_set_dumpable.m4 \
+	$(top_srcdir)/m4/q_quotactl.m4 $(top_srcdir)/m4/quota.m4 \
+	$(top_srcdir)/m4/random.m4 $(top_srcdir)/m4/rlimit.m4 \
+	$(top_srcdir)/m4/sendfile.m4 $(top_srcdir)/m4/size_t_signed.m4 \
+	$(top_srcdir)/m4/sockpeercred.m4 $(top_srcdir)/m4/sql.m4 \
+	$(top_srcdir)/m4/ssl.m4 $(top_srcdir)/m4/st_tim.m4 \
+	$(top_srcdir)/m4/static_array.m4 $(top_srcdir)/m4/test_with.m4 \
+	$(top_srcdir)/m4/time_t.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/typeof_dev_t.m4 \
+	$(top_srcdir)/m4/uoff_t_max.m4 $(top_srcdir)/m4/vararg.m4 \
+	$(top_srcdir)/m4/want_apparmor.m4 \
+	$(top_srcdir)/m4/want_bsdauth.m4 \
+	$(top_srcdir)/m4/want_bzlib.m4 \
+	$(top_srcdir)/m4/want_cassandra.m4 \
+	$(top_srcdir)/m4/want_cdb.m4 \
+	$(top_srcdir)/m4/want_checkpassword.m4 \
+	$(top_srcdir)/m4/want_clucene.m4 $(top_srcdir)/m4/want_db.m4 \
+	$(top_srcdir)/m4/want_gssapi.m4 $(top_srcdir)/m4/want_icu.m4 \
+	$(top_srcdir)/m4/want_ldap.m4 $(top_srcdir)/m4/want_lua.m4 \
+	$(top_srcdir)/m4/want_lz4.m4 $(top_srcdir)/m4/want_lzma.m4 \
+	$(top_srcdir)/m4/want_mysql.m4 $(top_srcdir)/m4/want_pam.m4 \
+	$(top_srcdir)/m4/want_passwd.m4 $(top_srcdir)/m4/want_pgsql.m4 \
+	$(top_srcdir)/m4/want_prefetch.m4 \
+	$(top_srcdir)/m4/want_shadow.m4 \
+	$(top_srcdir)/m4/want_sodium.m4 $(top_srcdir)/m4/want_solr.m4 \
+	$(top_srcdir)/m4/want_sqlite.m4 \
+	$(top_srcdir)/m4/want_stemmer.m4 \
+	$(top_srcdir)/m4/want_systemd.m4 \
+	$(top_srcdir)/m4/want_textcat.m4 \
+	$(top_srcdir)/m4/want_unwind.m4 $(top_srcdir)/m4/want_zlib.m4 \
+	$(top_srcdir)/m4/want_zstd.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(pkginc_lib_HEADERS) $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = test-program-client-local$(EXEEXT) \
+	test-program-client-unix$(EXEEXT) \
+	test-program-client-net$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libprogram_client_la_LIBADD =
+am_libprogram_client_la_OBJECTS = program-client.lo \
+	program-client-local.lo program-client-remote.lo
+libprogram_client_la_OBJECTS = $(am_libprogram_client_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+test_program_client_local_SOURCES = test-program-client-local.c
+test_program_client_local_OBJECTS =  \
+	test-program-client-local.$(OBJEXT)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = libprogram_client.la ../lib-dns/libdns.la \
+	../lib-test/libtest.la ../lib-mail/libmail.la \
+	../lib-charset/libcharset.la ../lib/liblib.la \
+	$(am__DEPENDENCIES_1)
+test_program_client_local_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_program_client_net_SOURCES = test-program-client-net.c
+test_program_client_net_OBJECTS = test-program-client-net.$(OBJEXT)
+test_program_client_net_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_program_client_unix_SOURCES = test-program-client-unix.c
+test_program_client_unix_OBJECTS = test-program-client-unix.$(OBJEXT)
+test_program_client_unix_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/program-client-local.Plo \
+	./$(DEPDIR)/program-client-remote.Plo \
+	./$(DEPDIR)/program-client.Plo \
+	./$(DEPDIR)/test-program-client-local.Po \
+	./$(DEPDIR)/test-program-client-net.Po \
+	./$(DEPDIR)/test-program-client-unix.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libprogram_client_la_SOURCES) test-program-client-local.c \
+	test-program-client-net.c test-program-client-unix.c
+DIST_SOURCES = $(libprogram_client_la_SOURCES) \
+	test-program-client-local.c test-program-client-net.c \
+	test-program-client-unix.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+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'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkginc_libdir)"
+HEADERS = $(noinst_HEADERS) $(pkginc_lib_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPARMOR_LIBS = @APPARMOR_LIBS@
+AR = @AR@
+AUTH_CFLAGS = @AUTH_CFLAGS@
+AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BINARY_CFLAGS = @BINARY_CFLAGS@
+BINARY_LDFLAGS = @BINARY_LDFLAGS@
+BISON = @BISON@
+CASSANDRA_CFLAGS = @CASSANDRA_CFLAGS@
+CASSANDRA_LIBS = @CASSANDRA_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CDB_LIBS = @CDB_LIBS@
+CFLAGS = @CFLAGS@
+CLUCENE_CFLAGS = @CLUCENE_CFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+COMPRESS_LIBS = @COMPRESS_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CRYPT_LIBS = @CRYPT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DICT_LIBS = @DICT_LIBS@
+DLLIB = @DLLIB@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FLEX = @FLEX@
+FUZZER_CPPFLAGS = @FUZZER_CPPFLAGS@
+FUZZER_LDFLAGS = @FUZZER_LDFLAGS@
+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@
+LD_NO_WHOLE_ARCHIVE = @LD_NO_WHOLE_ARCHIVE@
+LD_WHOLE_ARCHIVE = @LD_WHOLE_ARCHIVE@
+LIBCAP = @LIBCAP@
+LIBDOVECOT = @LIBDOVECOT@
+LIBDOVECOT_COMPRESS = @LIBDOVECOT_COMPRESS@
+LIBDOVECOT_DEPS = @LIBDOVECOT_DEPS@
+LIBDOVECOT_DSYNC = @LIBDOVECOT_DSYNC@
+LIBDOVECOT_LA_LIBS = @LIBDOVECOT_LA_LIBS@
+LIBDOVECOT_LDA = @LIBDOVECOT_LDA@
+LIBDOVECOT_LDAP = @LIBDOVECOT_LDAP@
+LIBDOVECOT_LIBFTS = @LIBDOVECOT_LIBFTS@
+LIBDOVECOT_LIBFTS_DEPS = @LIBDOVECOT_LIBFTS_DEPS@
+LIBDOVECOT_LOGIN = @LIBDOVECOT_LOGIN@
+LIBDOVECOT_LUA = @LIBDOVECOT_LUA@
+LIBDOVECOT_LUA_DEPS = @LIBDOVECOT_LUA_DEPS@
+LIBDOVECOT_SQL = @LIBDOVECOT_SQL@
+LIBDOVECOT_STORAGE = @LIBDOVECOT_STORAGE@
+LIBDOVECOT_STORAGE_DEPS = @LIBDOVECOT_STORAGE_DEPS@
+LIBEXTTEXTCAT_CFLAGS = @LIBEXTTEXTCAT_CFLAGS@
+LIBEXTTEXTCAT_LIBS = @LIBEXTTEXTCAT_LIBS@
+LIBICONV = @LIBICONV@
+LIBICU_CFLAGS = @LIBICU_CFLAGS@
+LIBICU_LIBS = @LIBICU_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSODIUM_CFLAGS = @LIBSODIUM_CFLAGS@
+LIBSODIUM_LIBS = @LIBSODIUM_LIBS@
+LIBTIRPC_CFLAGS = @LIBTIRPC_CFLAGS@
+LIBTIRPC_LIBS = @LIBTIRPC_LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBWRAP_LIBS = @LIBWRAP_LIBS@
+LINKED_STORAGE_LDADD = @LINKED_STORAGE_LDADD@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MODULE_LIBS = @MODULE_LIBS@
+MODULE_SUFFIX = @MODULE_SUFFIX@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_CONFIG = @MYSQL_CONFIG@
+MYSQL_LIBS = @MYSQL_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOPLUGIN_LDFLAGS = @NOPLUGIN_LDFLAGS@
+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@
+PANDOC = @PANDOC@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+PG_CONFIG = @PG_CONFIG@
+PIE_CFLAGS = @PIE_CFLAGS@
+PIE_LDFLAGS = @PIE_LDFLAGS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+QUOTA_LIBS = @QUOTA_LIBS@
+RANLIB = @RANLIB@
+RELRO_LDFLAGS = @RELRO_LDFLAGS@
+RPCGEN = @RPCGEN@
+RUN_TEST = @RUN_TEST@
+SED = @SED@
+SETTING_FILES = @SETTING_FILES@
+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@
+STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+ZSTD_CFLAGS = @ZSTD_CFLAGS@
+ZSTD_LIBS = @ZSTD_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+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@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+rundir = @rundir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sql_drivers = @sql_drivers@
+srcdir = @srcdir@
+ssldir = @ssldir@
+statedir = @statedir@
+sysconfdir = @sysconfdir@
+systemdservicetype = @systemdservicetype@
+systemdsystemunitdir = @systemdsystemunitdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_LTLIBRARIES = libprogram_client.la
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/lib-test \
+	-I$(top_srcdir)/src/lib-dns \
+	-I$(top_srcdir)/src/lib-mail
+
+libprogram_client_la_SOURCES = \
+	program-client.c \
+	program-client-local.c \
+	program-client-remote.c
+
+headers = \
+	program-client.h
+
+noinst_HEADERS = \
+	program-client-private.h
+
+pkginc_libdir = $(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
+test_programs = \
+	test-program-client-local \
+	test-program-client-unix \
+	test-program-client-net
+
+test_libs = \
+	libprogram_client.la \
+	../lib-dns/libdns.la  \
+	../lib-test/libtest.la \
+	../lib-mail/libmail.la \
+	../lib-charset/libcharset.la \
+	../lib/liblib.la \
+	$(MODULE_LIBS)
+
+test_program_client_local_SOURCE = test-program-client-local.c
+test_program_client_local_LDADD = $(test_libs)
+test_program_client_unix_SOURCE = test-program-client-unix.c
+test_program_client_unix_LDADD = $(test_libs)
+test_program_client_net_SOURCE = test-program-client-net.c
+test_program_client_net_LDADD = $(test_libs)
+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/lib-program-client/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/lib-program-client/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__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	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):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_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
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libprogram_client.la: $(libprogram_client_la_OBJECTS) $(libprogram_client_la_DEPENDENCIES) $(EXTRA_libprogram_client_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libprogram_client_la_OBJECTS) $(libprogram_client_la_LIBADD) $(LIBS)
+
+test-program-client-local$(EXEEXT): $(test_program_client_local_OBJECTS) $(test_program_client_local_DEPENDENCIES) $(EXTRA_test_program_client_local_DEPENDENCIES) 
+	@rm -f test-program-client-local$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_program_client_local_OBJECTS) $(test_program_client_local_LDADD) $(LIBS)
+
+test-program-client-net$(EXEEXT): $(test_program_client_net_OBJECTS) $(test_program_client_net_DEPENDENCIES) $(EXTRA_test_program_client_net_DEPENDENCIES) 
+	@rm -f test-program-client-net$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_program_client_net_OBJECTS) $(test_program_client_net_LDADD) $(LIBS)
+
+test-program-client-unix$(EXEEXT): $(test_program_client_unix_OBJECTS) $(test_program_client_unix_DEPENDENCIES) $(EXTRA_test_program_client_unix_DEPENDENCIES) 
+	@rm -f test-program-client-unix$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_program_client_unix_OBJECTS) $(test_program_client_unix_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/program-client-local.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/program-client-remote.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/program-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-program-client-local.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-program-client-net.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-program-client-unix.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkginc_libHEADERS: $(pkginc_lib_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(pkginc_lib_HEADERS)'; test -n "$(pkginc_libdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkginc_libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkginc_libdir)" || exit 1; \
+	fi; \
+	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|^.*/||'`; \
+	dir='$(DESTDIR)$(pkginc_libdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(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
+	$(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-am
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(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:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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-noinstLTLIBRARIES \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/program-client-local.Plo
+	-rm -f ./$(DEPDIR)/program-client-remote.Plo
+	-rm -f ./$(DEPDIR)/program-client.Plo
+	-rm -f ./$(DEPDIR)/test-program-client-local.Po
+	-rm -f ./$(DEPDIR)/test-program-client-net.Po
+	-rm -f ./$(DEPDIR)/test-program-client-unix.Po
+	-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-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 -f ./$(DEPDIR)/program-client-local.Plo
+	-rm -f ./$(DEPDIR)/program-client-remote.Plo
+	-rm -f ./$(DEPDIR)/program-client.Plo
+	-rm -f ./$(DEPDIR)/test-program-client-local.Po
+	-rm -f ./$(DEPDIR)/test-program-client-net.Po
+	-rm -f ./$(DEPDIR)/test-program-client-unix.Po
+	-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
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
+	check-local clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am 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-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 tags-am uninstall uninstall-am \
+	uninstall-pkginc_libHEADERS
+
+.PRECIOUS: Makefile
+
+
+check-local:
+	for bin in $(test_programs); do \
+	  if test "$$bin" = "test-program-client-local"; then \
+	    if ! env NOCHILDREN=yes $(RUN_TEST) ./$$bin; then exit 1; fi; \
+          else \
+	    if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+	  fi \
+	done
+
+# 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:
diff --git a/src/lib-program-client/program-client-local.c b/src/lib-program-client/program-client-local.c
new file mode 100644
index 0000000..499b2b5
--- /dev/null
+++ b/src/lib-program-client/program-client-local.c
@@ -0,0 +1,556 @@
+/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "lib-signals.h"
+#include "env-util.h"
+#include "execv-const.h"
+#include "array.h"
+#include "net.h"
+#include "istream.h"
+#include "ostream.h"
+#include "restrict-access.h"
+#include "child-wait.h"
+#include "time-util.h"
+#include "program-client-private.h"
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <grp.h>
+
+#define KILL_TIMEOUT 5000
+
+struct program_client_local {
+	struct program_client client;
+
+	struct child_wait *child_wait;
+	struct timeout *to_kill;
+
+	char *bin_path;
+
+	pid_t pid;
+	int status;
+	bool exited:1;
+	bool stopping:1;
+	bool sent_term:1;
+};
+
+static void
+program_client_local_waitchild(const struct child_wait_status *status,
+			       struct program_client_local *plclient);
+static void
+program_client_local_disconnect(struct program_client *pclient, bool force);
+static void
+program_client_local_exited(struct program_client_local *plclient);
+
+static void
+exec_child(const char *bin_path, const char *const *args,
+	   ARRAY_TYPE(const_string) *envs, int in_fd, int out_fd,
+	   int *extra_fds, bool drop_stderr)
+{
+	ARRAY_TYPE(const_string) exec_args;
+
+	/* Setup stdin/stdout */
+
+	if (in_fd < 0)
+		in_fd = dev_null_fd;
+	if (out_fd < 0)
+		out_fd = dev_null_fd;
+
+	if (in_fd != STDIN_FILENO && dup2(in_fd, STDIN_FILENO) < 0)
+		i_fatal("program %s: dup2(stdin) failed: %m", bin_path);
+	if (out_fd != STDOUT_FILENO && dup2(out_fd, STDOUT_FILENO) < 0)
+		i_fatal("program %s: dup2(stdout) failed: %m", bin_path);
+
+	if (in_fd != STDIN_FILENO && in_fd != dev_null_fd && close(in_fd) < 0)
+		i_error("program %s: close(in_fd) failed: %m", bin_path);
+	if (out_fd != STDOUT_FILENO && out_fd != dev_null_fd &&
+	    (out_fd != in_fd) && close(out_fd) < 0)
+		i_error("program %s: close(out_fd) failed: %m", bin_path);
+
+	/* Drop stderr if requested */
+	if (drop_stderr) {
+		if (dup2(dev_null_fd, STDERR_FILENO) < 0) {
+			i_fatal("program %s: "
+				"dup2(stderr) failed: %m", bin_path);
+		}
+	}
+
+	/* Setup extra fds */
+	if (extra_fds != NULL) {
+		int *efd;
+		for(efd = extra_fds; *efd != -1; efd += 2) {
+			i_assert(efd[1] != STDIN_FILENO);
+			i_assert(efd[1] != STDOUT_FILENO);
+			i_assert(efd[1] != STDERR_FILENO);
+			if (efd[0] != efd[1]) {
+				if (dup2(efd[0], efd[1]) < 0) {
+					i_fatal("program %s"
+						"dup2(extra_fd=%d) failed: %m",
+						bin_path, efd[1]);
+				}
+			}
+		}
+		for(efd = extra_fds; *efd != -1; efd += 2) {
+			if (efd[0] != efd[1] && efd[0] != STDIN_FILENO &&
+			    efd[0] != STDOUT_FILENO &&
+			    efd[0] != STDERR_FILENO) {
+				if (close(efd[0]) < 0) {
+					i_error("program %s"
+						"close(extra_fd=%d) failed: %m",
+						bin_path, efd[1]);
+				}
+			}
+		}
+	}
+
+	/* Compose argv */
+
+	t_array_init(&exec_args, 16);
+	array_push_back(&exec_args, &bin_path);
+	if (args != NULL) {
+		for(; *args != NULL; args++)
+			array_push_back(&exec_args, args);
+	}
+	(void) array_append_space(&exec_args);
+
+	/* Setup environment */
+
+	env_clean();
+	if (array_is_created(envs)) {
+		array_append_zero(envs);
+		env_put_array(array_front(envs));
+	}
+
+	/* Execute */
+
+	args = array_front(&exec_args);
+	execvp_const(args[0], args);
+}
+
+static void
+program_client_local_waitchild(const struct child_wait_status *status,
+			       struct program_client_local *plclient)
+{
+	struct program_client *pclient = &plclient->client;
+
+	i_assert(plclient->pid == status->pid);
+
+	e_debug(pclient->event, "Child process ended");
+
+	plclient->status = status->status;
+	plclient->exited = TRUE;
+	plclient->pid = -1;
+
+	if (plclient->stopping ||
+	    (pclient->fd_in < 0 && pclient->fd_out < 0))
+		program_client_local_exited(plclient);
+}
+
+static int
+program_client_local_connect(struct program_client *pclient)
+{
+	struct program_client_local *plclient =
+		(struct program_client_local *)pclient;
+	int fd_in[2] = { -1, -1 }, fd_out[2] = {-1, -1};
+	struct program_client_extra_fd *efds = NULL;
+	int *parent_extra_fds = NULL, *child_extra_fds = NULL;
+	unsigned int xfd_count = 0, i;
+
+	/* create normal I/O fds */
+	if (pclient->input != NULL) {
+		if (pipe(fd_in) < 0) {
+			e_error(pclient->event, "pipe(in) failed: %m");
+			return -1;
+		}
+	}
+	if (pclient->output != NULL) {
+		if (pipe(fd_out) < 0) {
+			e_error(pclient->event, "pipe(out) failed: %m");
+			return -1;
+		}
+	}
+
+	/* create pipes for additional output through side-channel fds */
+	if (array_is_created(&pclient->extra_fds)) {
+		int extra_fd[2];
+
+		efds = array_get_modifiable(&pclient->extra_fds, &xfd_count);
+		if (xfd_count > 0) {
+			i_assert(xfd_count < INT_MAX);
+			parent_extra_fds = t_new(int, xfd_count);
+			child_extra_fds = t_new(int, xfd_count * 2 + 1);
+			for(i = 0; i < xfd_count; i++) {
+				if (pipe(extra_fd) < 0) {
+					e_error(pclient->event,
+						"pipe(extra=%d) failed: %m",
+						extra_fd[1]);
+					return -1;
+				}
+				parent_extra_fds[i] = extra_fd[0];
+				child_extra_fds[i * 2 + 0] = extra_fd[1];
+				child_extra_fds[i * 2 + 1] = efds[i].child_fd;
+			}
+			child_extra_fds[xfd_count * 2] = -1;
+		}
+	}
+
+	/* fork child */
+	if ((plclient->pid = fork()) == (pid_t)-1) {
+		e_error(pclient->event, "fork() failed: %m");
+
+		/* clean up */
+		if (fd_in[0] >= 0 && close(fd_in[0]) < 0) {
+			e_error(pclient->event,
+				"close(pipe:in:rd) failed: %m");
+		}
+		if (fd_in[1] >= 0 && close(fd_in[1]) < 0) {
+			e_error(pclient->event,
+				"close(pipe:in:wr) failed: %m");
+		}
+		if (fd_out[0] >= 0 && close(fd_out[0]) < 0) {
+			e_error(pclient->event,
+				"close(pipe:out:rd) failed: %m");
+		}
+		if (fd_out[1] >= 0 && close(fd_out[1]) < 0) {
+			e_error(pclient->event,
+				"close(pipe:out:wr) failed: %m");
+		}
+		for(i = 0; i < xfd_count; i++) {
+			if (close(child_extra_fds[i * 2]) < 0) {
+				e_error(pclient->event,
+					"close(pipe:extra=%d:wr) failed: %m",
+					child_extra_fds[i * 2 + 1]);
+			}
+			if (close(parent_extra_fds[i]) < 0) {
+				e_error(pclient->event,
+					"close(pipe:extra=%d:rd) failed: %m",
+					child_extra_fds[i * 2 + 1]);
+			}
+		}
+		return -1;
+	}
+
+	if (plclient->pid == 0) {
+		/* child */
+		if (fd_in[1] >= 0 && close(fd_in[1]) < 0) {
+			e_error(pclient->event,
+				"close(pipe:in:wr) failed: %m");
+		}
+		if (fd_out[0] >= 0 && close(fd_out[0]) < 0) {
+			e_error(pclient->event,
+				"close(pipe:out:rd) failed: %m");
+		}
+		for(i = 0; i < xfd_count; i++) {
+			if (close(parent_extra_fds[i]) < 0) {
+				e_error(pclient->event,
+					"close(pipe:extra=%d:rd) failed: %m",
+					child_extra_fds[i * 2 + 1]);
+			}
+		}
+
+		/* if we want to allow root, then we will not drop
+		   root privileges */
+		restrict_access(&pclient->set.restrict_set,
+				(pclient->set.allow_root ?
+					RESTRICT_ACCESS_FLAG_ALLOW_ROOT : 0),
+				pclient->set.home);
+
+		exec_child(plclient->bin_path, pclient->args, &pclient->envs,
+			   fd_in[0], fd_out[1], child_extra_fds,
+			   pclient->set.drop_stderr);
+		i_unreached();
+	}
+
+	/* parent */
+	e_debug(pclient->event, "Forked child process");
+
+	program_client_set_label(pclient,
+		t_strdup_printf("exec:%s (%d)", plclient->bin_path,
+				plclient->pid));
+
+	if (fd_in[0] >= 0 && close(fd_in[0]) < 0) {
+		e_error(pclient->event, "close(pipe:in:rd) failed: %m");
+	}
+	if (fd_out[1] >= 0 && close(fd_out[1]) < 0) {
+		e_error(pclient->event, "close(pipe:out:wr) failed: %m");
+	}
+	if (fd_in[1] >= 0) {
+		net_set_nonblock(fd_in[1], TRUE);
+		pclient->fd_out = fd_in[1];
+	}
+	if (fd_out[0] >= 0) {
+		net_set_nonblock(fd_out[0], TRUE);
+		pclient->fd_in = fd_out[0];
+	}
+	for(i = 0; i < xfd_count; i++) {
+		if (close(child_extra_fds[i * 2]) < 0) {
+			e_error(pclient->event,
+				"close(pipe:extra=%d:wr) failed: %m",
+				child_extra_fds[i * 2 + 1]);
+		}
+		net_set_nonblock(parent_extra_fds[i], TRUE);
+		efds[i].parent_fd = parent_extra_fds[i];
+	}
+
+	program_client_init_streams(pclient);
+
+	plclient->child_wait =
+		child_wait_new_with_pid(plclient->pid,
+					program_client_local_waitchild,
+					plclient);
+	program_client_connected(pclient);
+	return 0;
+}
+
+static int
+program_client_local_close_output(struct program_client *pclient)
+{
+	int fd_out = pclient->fd_out;
+
+	pclient->fd_out = -1;
+
+	/* Shutdown output; program stdin will get EOF */
+	if (fd_out >= 0 && close(fd_out) < 0) {
+		e_error(pclient->event,
+			"close(fd_out) failed: %m");
+		return -1;
+	}
+	return 1;
+}
+
+static void
+program_client_local_exited(struct program_client_local *plclient)
+{
+	struct program_client *pclient = &plclient->client;
+
+	timeout_remove(&plclient->to_kill);
+	if (plclient->child_wait != NULL)
+		child_wait_free(&plclient->child_wait);
+
+	plclient->exited = TRUE;
+	plclient->pid = -1;
+	/* Evaluate child exit status */
+	pclient->exit_status = PROGRAM_CLIENT_EXIT_STATUS_INTERNAL_FAILURE;
+
+	if (WIFEXITED(plclient->status)) {
+		/* Exited */
+		int exit_code = WEXITSTATUS(plclient->status);
+
+		if (exit_code != 0) {
+			e_info(pclient->event,
+			       "Terminated with non-zero exit code %d",
+			       exit_code);
+			pclient->exit_status =
+				PROGRAM_CLIENT_EXIT_STATUS_FAILURE;
+		} else {
+			pclient->exit_status =
+				PROGRAM_CLIENT_EXIT_STATUS_SUCCESS;
+		}
+	} else if (WIFSIGNALED(plclient->status)) {
+		/* Killed with a signal */
+		if (plclient->sent_term) {
+			e_error(pclient->event,
+				"Forcibly terminated with signal %d",
+				WTERMSIG(plclient->status));
+		} else {
+			e_error(pclient->event,
+				"Terminated abnormally with signal %d",
+				WTERMSIG(plclient->status));
+		}
+	} else if (WIFSTOPPED(plclient->status)) {
+		/* Stopped */
+		e_error(pclient->event,
+			"Stopped with signal %d",
+			WSTOPSIG(plclient->status));
+	} else {
+		/* Something else */
+		e_error(pclient->event,
+			"Terminated abnormally with status %d",
+			plclient->status);
+	}
+
+	program_client_disconnected(pclient);
+}
+
+static void
+program_client_local_kill_now(struct program_client_local *plclient)
+{
+	struct program_client *pclient = &plclient->client;
+
+	if (plclient->child_wait != NULL) {
+		/* no need for this anymore */
+		child_wait_free(&plclient->child_wait);
+	}
+
+	if (plclient->pid < 0)
+		return;
+
+	e_debug(pclient->event, "Sending SIGKILL signal to program");
+
+	/* kill it brutally now: it should die right away */
+	if (kill(plclient->pid, SIGKILL) < 0) {
+		e_error(pclient->event,
+			"Failed to send SIGKILL signal to program");
+	} else if (waitpid(plclient->pid, &plclient->status, 0) < 0) {
+		e_error(pclient->event, "waitpid(%d) failed: %m",
+			plclient->pid);
+	}
+}
+
+static void
+program_client_local_kill(struct program_client_local *plclient)
+{
+	struct program_client *pclient = &plclient->client;
+
+	/* time to die */
+	timeout_remove(&plclient->to_kill);
+
+	i_assert(plclient->pid != (pid_t)-1);
+
+	if (plclient->client.error == PROGRAM_CLIENT_ERROR_NONE)
+		plclient->client.error = PROGRAM_CLIENT_ERROR_RUN_TIMEOUT;
+
+	if (plclient->sent_term) {
+		/* Timed out again */
+		e_debug(pclient->event,
+			"Program did not die after %d milliseconds",
+			KILL_TIMEOUT);
+
+		program_client_local_kill_now(plclient);
+		program_client_local_exited(plclient);
+		return;
+	}
+
+	e_debug(pclient->event,
+		"Execution timed out after %u milliseconds: "
+		"Sending TERM signal",
+		pclient->set.input_idle_timeout_msecs);
+
+	/* send sigterm, keep on waiting */
+	plclient->sent_term = TRUE;
+
+	/* Kill child gently first */
+	if (kill(plclient->pid, SIGTERM) < 0) {
+		e_error(pclient->event,
+			"Failed to send SIGTERM signal to program");
+		(void)kill(plclient->pid, SIGKILL);
+		program_client_local_exited(plclient);
+		return;
+	}
+
+	i_assert(plclient->child_wait != NULL);
+
+	plclient->to_kill = timeout_add_short(KILL_TIMEOUT,
+			    program_client_local_kill, plclient);
+}
+
+static void
+program_client_local_disconnect(struct program_client *pclient, bool force)
+{
+	struct program_client_local *plclient =
+		(struct program_client_local *) pclient;
+	pid_t pid = plclient->pid;
+	unsigned long runtime, timeout = 0;
+
+	if (plclient->exited) {
+		program_client_local_exited(plclient);
+		return;
+	}
+
+	if (plclient->stopping) return;
+	plclient->stopping = TRUE;
+
+	if (pid < 0) {
+		/* program never started */
+		e_debug(pclient->event, "Child process never started");
+		pclient->exit_status = PROGRAM_CLIENT_EXIT_STATUS_FAILURE;
+		program_client_local_exited(plclient);
+		return;
+	}
+
+	/* make sure it hasn't already been reaped */
+	if (waitpid(plclient->pid, &plclient->status, WNOHANG) > 0) {
+		e_debug(pclient->event, "Child process ended");
+		program_client_local_exited(plclient);
+		return;
+	}
+
+	/* Calculate timeout */
+	runtime = timeval_diff_msecs(&ioloop_timeval, &pclient->start_time);
+	if (force || (pclient->set.input_idle_timeout_msecs > 0 &&
+		      runtime >= pclient->set.input_idle_timeout_msecs)) {
+		e_debug(pclient->event,
+			"Terminating program immediately");
+
+		program_client_local_kill(plclient);
+		return;
+	}
+
+	if (runtime < pclient->set.input_idle_timeout_msecs)
+		timeout = pclient->set.input_idle_timeout_msecs - runtime;
+
+	e_debug(pclient->event,
+		"Waiting for program to finish after %lu msecs "
+		"(timeout = %lu msecs)", runtime, timeout);
+
+	if (timeout == 0)
+		return;
+
+	plclient->to_kill = timeout_add_short(timeout,
+					      program_client_local_kill,
+					      plclient);
+}
+
+static void
+program_client_local_destroy(struct program_client *pclient)
+{
+	struct program_client_local *plclient =
+		(struct program_client_local *)pclient;
+
+	timeout_remove(&plclient->to_kill);
+
+	program_client_local_kill_now(plclient);
+	child_wait_deinit();
+}
+
+static void
+program_client_local_switch_ioloop(struct program_client *pclient)
+{
+	struct program_client_local *plclient =
+		(struct program_client_local *)pclient;
+
+	if (plclient->to_kill != NULL)
+		plclient->to_kill = io_loop_move_timeout(&plclient->to_kill);
+	child_wait_switch_ioloop();
+}
+
+struct program_client *
+program_client_local_create(const char *bin_path,
+			    const char *const *args,
+			    const struct program_client_settings *set)
+{
+	struct program_client_local *plclient;
+	const char *label;
+	pool_t pool;
+
+	label = t_strconcat("exec:", bin_path, NULL);
+
+	pool = pool_alloconly_create("program client local", 1024);
+	plclient = p_new(pool, struct program_client_local, 1);
+	program_client_init(&plclient->client, pool, label, args, set);
+	plclient->client.connect = program_client_local_connect;
+	plclient->client.close_output = program_client_local_close_output;
+	plclient->client.switch_ioloop = program_client_local_switch_ioloop;
+	plclient->client.disconnect = program_client_local_disconnect;
+	plclient->client.destroy = program_client_local_destroy;
+	plclient->bin_path = p_strdup(pool, bin_path);
+	plclient->pid = -1;
+
+	child_wait_init();
+
+	return &plclient->client;
+}
diff --git a/src/lib-program-client/program-client-private.h b/src/lib-program-client/program-client-private.h
new file mode 100644
index 0000000..5f6260a
--- /dev/null
+++ b/src/lib-program-client/program-client-private.h
@@ -0,0 +1,85 @@
+#ifndef PROGRAM_CLIENT_PRIVATE_H
+#define PROGRAM_CLIENT_PRIVATE_H
+
+#include "program-client.h"
+
+enum program_client_error {
+	PROGRAM_CLIENT_ERROR_NONE,
+	PROGRAM_CLIENT_ERROR_CONNECT_TIMEOUT,
+	PROGRAM_CLIENT_ERROR_RUN_TIMEOUT,
+	PROGRAM_CLIENT_ERROR_IO,
+	PROGRAM_CLIENT_ERROR_OTHER
+};
+
+struct program_client_extra_fd {
+	struct program_client *pclient;
+
+	int child_fd, parent_fd;
+	struct istream *input;
+	struct io *io;
+
+	program_client_fd_callback_t *callback;
+	void *context;
+};
+
+struct program_client {
+	pool_t pool;
+	struct program_client_settings set;
+
+	const char **args;
+	ARRAY_TYPE(const_string) envs;
+
+	struct event *event;
+
+	int fd_in, fd_out;
+	struct io *io;
+	struct timeout *to;
+	struct timeval start_time;
+
+	struct istream *input, *program_input, *raw_program_input;
+	struct ostream *output, *program_output, *raw_program_output;
+
+	struct iostream_pump *pump_in, *pump_out;
+
+	ARRAY(struct program_client_extra_fd) extra_fds;
+
+	program_client_callback_t *callback;
+	void *context;
+
+	bool other_error;
+	enum program_client_error error;
+	enum program_client_exit_status exit_status;
+
+	int (*connect) (struct program_client * pclient);
+	int (*close_output) (struct program_client * pclient);
+	void (*switch_ioloop) (struct program_client * pclient);
+	void (*disconnect) (struct program_client * pclient, bool force);
+	void (*destroy) (struct program_client * pclient);
+
+	bool debug:1;
+	bool disconnected:1;
+	bool output_seekable:1;
+	bool destroying:1;
+};
+
+void program_client_set_label(struct program_client *pclient,
+			      const char *label);
+
+void program_client_init(struct program_client *pclient, pool_t pool,
+			 const char *initial_label,
+			 const char *const *args,
+			 const struct program_client_settings *set)
+			 ATTR_NULL(5);
+
+void program_client_init_streams(struct program_client *pclient);
+
+void program_client_connected(struct program_client *pclient);
+
+void program_client_fail(struct program_client *pclient,
+			 enum program_client_error error);
+
+void program_client_program_input(struct program_client *pclient);
+
+void program_client_disconnected(struct program_client *pclient);
+
+#endif
diff --git a/src/lib-program-client/program-client-remote.c b/src/lib-program-client/program-client-remote.c
new file mode 100644
index 0000000..858abe6
--- /dev/null
+++ b/src/lib-program-client/program-client-remote.c
@@ -0,0 +1,702 @@
+/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "ioloop.h"
+#include "str.h"
+#include "strescape.h"
+#include "array.h"
+#include "net.h"
+#include "write-full.h"
+#include "eacces-error.h"
+#include "istream-private.h"
+#include "ostream.h"
+#include "dns-lookup.h"
+#include "program-client-private.h"
+
+#include <unistd.h>
+#include <sys/wait.h>
+#include <sysexits.h>
+
+#define PROGRAM_CLIENT_VERSION_MAJOR "4"
+#define PROGRAM_CLIENT_VERSION_MINOR "0"
+
+#define PROGRAM_CLIENT_VERSION_STRING \
+	"VERSION\tscript\t" \
+		PROGRAM_CLIENT_VERSION_MAJOR "\t" \
+		PROGRAM_CLIENT_VERSION_MINOR "\n"
+
+/*
+ * Script client input stream
+ */
+
+struct program_client_istream {
+	struct istream_private istream;
+
+	struct stat statbuf;
+
+	struct program_client *client;
+
+	bool parsed_result:1;
+};
+
+static void program_client_istream_destroy(struct iostream_private *stream)
+{
+	struct program_client_istream *scstream =
+		(struct program_client_istream *)stream;
+
+	i_stream_unref(&scstream->istream.parent);
+}
+
+static void
+program_client_istream_parse_result(struct program_client_istream *scstream,
+				    size_t pos)
+{
+	struct istream_private *stream = &scstream->istream;
+
+	if (scstream->parsed_result)
+		return;
+	scstream->parsed_result = TRUE;
+
+	if (stream->buffer == NULL || pos < 2 ||
+	    stream->buffer[pos - 1] != '\n') {
+		if (pos == 0) {
+			e_error(scstream->client->event,
+				"No result code received from remote");
+		} else if (pos < 2) {
+			e_error(scstream->client->event,
+				"Received too short result code from remote");
+		} else {
+			e_error(scstream->client->event,
+				"Missing LF in result code");
+		}
+		scstream->client->exit_status =
+			PROGRAM_CLIENT_EXIT_STATUS_INTERNAL_FAILURE;
+		return;
+	}
+
+	unsigned char rcode = stream->buffer[pos - 2];
+	switch (rcode) {
+	case '+':
+		e_debug(scstream->client->event,
+			"Received '+' result code from remote");
+		scstream->client->exit_status =
+			PROGRAM_CLIENT_EXIT_STATUS_SUCCESS;
+		break;
+	case '-':
+		e_debug(scstream->client->event,
+			"Received '-' result code from remote");
+		scstream->client->exit_status =
+			PROGRAM_CLIENT_EXIT_STATUS_FAILURE;
+		break;
+	default:
+		if (rcode >= 0x20 && rcode < 0x7f) {
+			e_error(scstream->client->event,
+				"Unexpected result code '%c'", rcode);
+		} else {
+			e_error(scstream->client->event,
+				"Unexpected result code 0x%02x", rcode);
+		}
+		scstream->client->exit_status =
+			PROGRAM_CLIENT_EXIT_STATUS_INTERNAL_FAILURE;
+	}
+}
+
+static ssize_t program_client_istream_read(struct istream_private *stream)
+{
+	struct program_client_istream *scstream =
+		(struct program_client_istream *)stream;
+	size_t pos, reserved;
+	ssize_t ret = 0;
+
+	i_stream_skip(stream->parent, stream->skip);
+	stream->skip = 0;
+
+	stream->buffer = i_stream_get_data(stream->parent, &pos);
+
+	if (stream->parent->eof) {
+		/* Check return code at EOF */
+		program_client_istream_parse_result(scstream, pos);
+	}
+
+	reserved = 0;
+	if (stream->buffer != NULL && pos >= 1) {
+		/* Retain/hide potential return code at end of buffer */
+		reserved = (stream->buffer[pos - 1] == '\n' && pos > 1 ? 2 : 1);
+		pos -= reserved;
+	}
+
+	if (stream->parent->eof) {
+		i_assert(scstream->parsed_result);
+		if (pos == 0)
+			i_stream_skip(stream->parent, reserved);
+		stream->istream.eof = TRUE;
+		ret = -1;
+	} else {
+		do {
+			ret = i_stream_read_memarea(stream->parent);
+			stream->istream.stream_errno =
+				stream->parent->stream_errno;
+			stream->buffer =
+				i_stream_get_data(stream->parent, &pos);
+			if (ret == -2) {
+				/* Input buffer full */
+				return -2;
+			}
+			if (ret < 0 && stream->istream.stream_errno != 0)
+				break;
+
+			if (stream->parent->eof) {
+				/* Check return code at EOF */
+				program_client_istream_parse_result(
+					scstream, pos);
+			}
+
+			ssize_t reserve_mod = 0;
+			if (stream->buffer != NULL && pos >= 1) {
+				/* Retain/hide potential return code at end of
+				   buffer */
+				size_t old_reserved = reserved;
+
+				reserved = (stream->buffer[pos - 1] == '\n' &&
+					    pos > 1 ? 2 : 1);
+				reserve_mod = (ssize_t)reserved - (ssize_t)old_reserved;
+				pos -= reserved;
+			}
+			if (ret == 0) {
+				/* Parent already blocked, but we had to update
+				   pos first, to make sure reserved bytes are
+				   not visible to application. */
+				break;
+			}
+			if (ret > 0 && ret >= reserve_mod) {
+				/* Subtract additional reserved bytes */
+				ret -= reserve_mod;
+			}
+
+			if (ret <= 0 && stream->parent->eof) {
+				/* Parent EOF and not more data to return;
+				   EOF here as well */
+				i_assert(scstream->parsed_result);
+				if (pos == 0)
+					i_stream_skip(stream->parent, reserved);
+				stream->istream.eof = TRUE;
+				ret = -1;
+			}
+		} while (ret == 0);
+	}
+
+	stream->pos = pos;
+
+	i_assert(ret != -1 || stream->istream.eof ||
+		 stream->istream.stream_errno != 0);
+	return ret;
+}
+
+static void ATTR_NORETURN
+program_client_istream_sync(struct istream_private *stream ATTR_UNUSED)
+{
+	i_panic("program_client_istream sync() not implemented");
+}
+
+static int
+program_client_istream_stat(struct istream_private *stream, bool exact)
+{
+	struct program_client_istream *scstream =
+		(struct program_client_istream *)stream;
+	const struct stat *st;
+	int ret;
+
+	/* Stat the original stream */
+	ret = i_stream_stat(stream->parent, exact, &st);
+	if (ret < 0 || st->st_size == -1 || !exact)
+		return ret;
+
+	scstream->statbuf = *st;
+	scstream->statbuf.st_size = -1;
+
+	return ret;
+}
+
+static struct istream *
+program_client_istream_create(struct program_client *program_client,
+			      struct istream *input)
+{
+	struct program_client_istream *scstream;
+
+	scstream = i_new(struct program_client_istream, 1);
+	scstream->client = program_client;
+
+	scstream->istream.max_buffer_size = input->real_stream->max_buffer_size;
+
+	scstream->istream.iostream.destroy = program_client_istream_destroy;
+	scstream->istream.read = program_client_istream_read;
+	scstream->istream.sync = program_client_istream_sync;
+	scstream->istream.stat = program_client_istream_stat;
+
+	scstream->istream.istream.readable_fd = FALSE;
+	scstream->istream.istream.blocking = input->blocking;
+	scstream->istream.istream.seekable = FALSE;
+
+	i_stream_seek(input, 0);
+
+	return i_stream_create(&scstream->istream, input,
+			       i_stream_get_fd(input), 0);
+}
+
+/*
+ * Program client
+ */
+
+struct program_client_remote {
+	struct program_client client;
+
+	const char *address;
+	struct dns_lookup_settings dns_set;
+	struct dns_lookup *lookup;
+	unsigned int ips_count;
+	unsigned int ips_left;
+	struct ip_addr *ips;
+	in_port_t port;
+
+	struct timeout *to_retry;
+
+	bool noreply:1;
+	bool resolved:1;
+	bool have_hostname:1;
+};
+
+static void
+program_client_net_connect_again(struct program_client_remote *prclient);
+
+static void
+program_client_remote_connected(struct program_client_remote *prclient)
+{
+	struct program_client *pclient = &prclient->client;
+	const char **args = pclient->args;
+	string_t *str;
+
+	timeout_remove(&pclient->to);
+	io_remove(&pclient->io);
+	program_client_init_streams(pclient);
+
+	if (!prclient->noreply) {
+		struct istream *is = pclient->raw_program_input;
+
+		pclient->raw_program_input =
+			program_client_istream_create(pclient, is);
+		i_stream_unref(&is);
+	}
+
+	str = t_str_new(1024);
+	str_append(str, PROGRAM_CLIENT_VERSION_STRING);
+	if (array_is_created(&pclient->envs)) {
+		const char *env;
+		array_foreach_elem(&pclient->envs, env) {
+			str_append(str, "env_");
+			str_append_tabescaped(str, env);
+			str_append_c(str, '\n');
+		}
+	}
+	if (prclient->noreply)
+		str_append(str, "noreply\n");
+	else
+		str_append(str, "-\n");
+	if (args != NULL) {
+		for(; *args != NULL; args++) {
+			str_append_tabescaped(str, *args);
+			str_append_c(str, '\n');
+		}
+	}
+	str_append_c(str, '\n');
+
+	if (o_stream_send(pclient->raw_program_output,
+			  str_data(str), str_len(str)) < 0) {
+		e_error(pclient->event,
+			"write(%s) failed: %s",
+			o_stream_get_name(pclient->raw_program_output),
+			o_stream_get_error(pclient->raw_program_output));
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_IO);
+		return;
+	}
+
+	program_client_connected(pclient);
+}
+
+static int program_client_unix_connect(struct program_client *pclient);
+
+static void
+program_client_unix_reconnect(struct program_client_remote *prclient)
+{
+	(void)program_client_unix_connect(&prclient->client);
+}
+
+static int program_client_unix_connect(struct program_client *pclient)
+{
+	struct program_client_remote *prclient =
+		(struct program_client_remote *)pclient;
+	int fd;
+
+	e_debug(pclient->event, "Trying to connect");
+
+	timeout_remove(&prclient->to_retry);
+
+	if ((fd = net_connect_unix(prclient->address)) < 0) {
+		switch (errno) {
+		case EACCES:
+			e_error(pclient->event, "%s",
+				eacces_error_get("net_connect_unix",
+						 prclient->address));
+			return -1;
+		case EAGAIN:
+			prclient->to_retry = timeout_add_short(
+				100, program_client_unix_reconnect, prclient);
+			return 0;
+		default:
+			e_error(pclient->event,
+				"net_connect_unix(%s) failed: %m",
+				prclient->address);
+			return -1;
+		}
+	}
+
+	pclient->fd_in = (prclient->noreply && pclient->output == NULL ?
+			  -1 : fd);
+	pclient->fd_out = fd;
+	pclient->io = io_add(fd, IO_WRITE,
+			     program_client_remote_connected, prclient);
+	return 0;
+}
+
+static void
+program_client_net_connect_timeout(struct program_client_remote *prclient)
+{
+	struct program_client *pclient = &prclient->client;
+
+	io_remove(&pclient->io);
+	timeout_remove(&pclient->to);
+
+	e_error(pclient->event, "connect(%s) failed: "
+		"Timeout in %u milliseconds", prclient->address,
+		pclient->set.client_connect_timeout_msecs);
+
+	/* Set error to timeout here */
+	pclient->error = PROGRAM_CLIENT_ERROR_CONNECT_TIMEOUT;
+	i_close_fd(&pclient->fd_out);
+	pclient->fd_in = pclient->fd_out = -1;
+	program_client_net_connect_again(prclient);
+}
+
+/* See if connect succeeded or not, if it did, then proceed normally, otherwise
+   try reconnect to next address.
+ */
+static void program_client_net_connected(struct program_client_remote *prclient)
+{
+	struct program_client *pclient = &prclient->client;
+
+	io_remove(&pclient->io);
+
+	errno = net_geterror(pclient->fd_out);
+	if (errno != 0) {
+		e_error(pclient->event, "connect(%s) failed: %m",
+			prclient->address);
+
+		/* Disconnect and try again */
+		i_close_fd(&pclient->fd_out);
+		pclient->fd_in = pclient->fd_out = -1;
+		program_client_net_connect_again(prclient);
+	} else {
+		pclient->io = io_add(pclient->fd_out, IO_WRITE,
+				     program_client_remote_connected, prclient);
+	}
+}
+
+static void
+program_client_net_connect_real(struct program_client_remote *prclient)
+{
+	struct program_client *pclient = &prclient->client;
+	const char *address, *label;
+
+	timeout_remove(&pclient->to);
+	timeout_remove(&prclient->to_retry);
+
+	i_assert(prclient->ips_count > 0);
+
+	if (net_ipport2str(prclient->ips, prclient->port, &address) < 0)
+		i_unreached();
+	label = t_strconcat("tcp:", address, NULL);
+	program_client_set_label(pclient, label);
+
+	e_debug(pclient->event, "Trying to connect (timeout %u msecs)",
+		pclient->set.client_connect_timeout_msecs);
+
+	/* Try to connect */
+	int fd;
+	if ((fd = net_connect_ip(prclient->ips, prclient->port,
+				 (prclient->ips->family == AF_INET ?
+				  &net_ip4_any : &net_ip6_any))) < 0) {
+		e_error(pclient->event, "connect(%s) failed: %m", address);
+		prclient->to_retry = timeout_add_short(
+			0, program_client_net_connect_again, prclient);
+		return;
+	}
+
+	pclient->fd_in = (prclient->noreply && pclient->output == NULL ?
+			  -1 : fd);
+	pclient->fd_out = fd;
+	pclient->io = io_add(fd, IO_WRITE,
+			     program_client_net_connected, prclient);
+
+	if (pclient->set.client_connect_timeout_msecs != 0) {
+		pclient->to = timeout_add(
+			pclient->set.client_connect_timeout_msecs,
+			program_client_net_connect_timeout, prclient);
+	}
+}
+
+static void
+program_client_net_connect_again(struct program_client_remote *prclient)
+{
+	struct program_client *pclient = &prclient->client;
+	enum program_client_error error = pclient->error;
+
+	pclient->error = PROGRAM_CLIENT_ERROR_NONE;
+
+	if (--prclient->ips_left == 0) {
+		if (prclient->ips_count > 1) {
+			e_error(pclient->event,
+				"No IP addresses left to try");
+		}
+		program_client_fail(pclient,
+				    (error != PROGRAM_CLIENT_ERROR_NONE ?
+				     error : PROGRAM_CLIENT_ERROR_OTHER));
+		return;
+	};
+
+	prclient->ips++;
+	program_client_net_connect_real(prclient);
+}
+
+static void
+program_client_net_connect_resolved(const struct dns_lookup_result *result,
+				    struct program_client_remote *prclient)
+{
+	struct program_client *pclient = &prclient->client;
+
+	if (result->ret != 0) {
+		e_error(pclient->event, "Cannot resolve `%s': %s",
+			prclient->address, result->error);
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_OTHER);
+		return;
+	}
+
+	e_debug(pclient->event, "DNS lookup successful; got %d IPs",
+		result->ips_count);
+
+	/* Reduce timeout */
+	if (pclient->set.client_connect_timeout_msecs > 0) {
+		if (pclient->set.client_connect_timeout_msecs <=
+		    result->msecs) {
+			/* We ran out of time */
+			program_client_fail(
+				pclient, PROGRAM_CLIENT_ERROR_CONNECT_TIMEOUT);
+			return;
+		}
+		pclient->set.client_connect_timeout_msecs -= result->msecs;
+	}
+
+	/* Then connect */
+	prclient->ips_count = result->ips_count;
+	prclient->ips_left = prclient->ips_count;
+	prclient->ips = p_memdup(pclient->pool, result->ips,
+				 sizeof(struct ip_addr)*result->ips_count);
+	program_client_net_connect_real(prclient);
+}
+
+static int program_client_net_connect_init(struct program_client *pclient)
+{
+	struct program_client_remote *prclient =
+		(struct program_client_remote *)pclient;
+	struct ip_addr ip;
+
+	if (prclient->ips != NULL) {
+		/* Nothing to do */
+	} else if (net_addr2ip(prclient->address, &ip) == 0) {
+		prclient->resolved = TRUE;
+		prclient->ips = p_new(pclient->pool, struct ip_addr, 1);
+		*prclient->ips = ip;
+		prclient->ips_count = 1;
+	} else {
+		prclient->resolved = FALSE;
+		if (pclient->set.dns_client_socket_path != NULL) {
+			e_debug(pclient->event,
+				"Performing asynchronous DNS lookup");
+			prclient->dns_set.dns_client_socket_path =
+				pclient->set.dns_client_socket_path;
+			prclient->dns_set.timeout_msecs =
+				pclient->set.client_connect_timeout_msecs;
+			prclient->dns_set.event_parent = pclient->event;
+			dns_lookup(prclient->address, &prclient->dns_set,
+				   program_client_net_connect_resolved,
+				   prclient, &prclient->lookup);
+			return 0;
+		} else {
+			struct ip_addr *ips;
+			unsigned int ips_count;
+			int err;
+
+			/* Guess we do it here then.. */
+			err = net_gethostbyname(prclient->address,
+						&ips, &ips_count);
+			if (err != 0) {
+				e_error(pclient->event,
+					"Cannot resolve `%s': %s",
+					prclient->address,
+					net_gethosterror(err));
+				return -1;
+			}
+			prclient->ips_count = ips_count;
+			prclient->ips = p_memdup(pclient->pool,
+						 ips, sizeof(*ips)*ips_count);
+
+			e_debug(pclient->event,
+				"DNS lookup successful; got %d IPs",
+				ips_count);
+		}
+	}
+
+	prclient->ips_left = prclient->ips_count;
+	prclient->to_retry = timeout_add_short(
+		0, program_client_net_connect_real, prclient);
+	return 0;
+}
+
+static int program_client_remote_close_output(struct program_client *pclient)
+{
+	int fd_out = pclient->fd_out, fd_in = pclient->fd_in;
+
+	pclient->fd_out = -1;
+
+	/* Shutdown output; program stdin will get EOF */
+	if (fd_out >= 0) {
+		if (fd_in >= 0) {
+			if (shutdown(fd_out, SHUT_WR) < 0 &&
+			    errno != ENOTCONN) {
+				e_error(pclient->event,
+					"shutdown(fd_out, SHUT_WR) failed: %m");
+				return -1;
+			}
+		} else {
+			i_close_fd(&fd_out);
+		}
+	}
+
+	return 1;
+}
+
+static void
+program_client_remote_disconnect(struct program_client *pclient,
+				 bool force ATTR_UNUSED)
+{
+	struct program_client_remote *prclient =
+		(struct program_client_remote *)pclient;
+
+	timeout_remove(&prclient->to_retry);
+
+	program_client_disconnected(pclient);
+}
+
+static void
+program_client_remote_switch_ioloop(struct program_client *pclient)
+{
+	struct program_client_remote *prclient =
+		(struct program_client_remote *)pclient;
+
+	if (prclient->to_retry != NULL)
+		prclient->to_retry = io_loop_move_timeout(&prclient->to_retry);
+	if (prclient->lookup != NULL)
+		dns_lookup_switch_ioloop(prclient->lookup);
+}
+
+struct program_client *
+program_client_unix_create(const char *socket_path, const char *const *args,
+			   const struct program_client_settings *set,
+			   bool noreply)
+{
+	struct program_client_remote *prclient;
+	const char *label;
+	pool_t pool;
+
+	label = t_strconcat("unix:", socket_path, NULL);
+
+	pool = pool_alloconly_create("program client unix", 1024);
+	prclient = p_new(pool, struct program_client_remote, 1);
+	program_client_init(&prclient->client, pool, label, args, set);
+	prclient->client.connect = program_client_unix_connect;
+	prclient->client.close_output = program_client_remote_close_output;
+	prclient->client.disconnect = program_client_remote_disconnect;
+	prclient->client.switch_ioloop = program_client_remote_switch_ioloop;
+	prclient->address = p_strdup(pool, socket_path);
+	prclient->noreply = noreply;
+
+	return &prclient->client;
+}
+
+struct program_client *
+program_client_net_create(const char *host, in_port_t port,
+			  const char *const *args,
+			  const struct program_client_settings *set,
+			  bool noreply)
+{
+	struct program_client_remote *prclient;
+	const char *label;
+	pool_t pool;
+
+	label = t_strdup_printf("tcp:%s:%u", host, port);
+
+	pool = pool_alloconly_create("program client net", 1024);
+	prclient = p_new(pool, struct program_client_remote, 1);
+	program_client_init(&prclient->client, pool, label, args, set);
+	prclient->client.connect = program_client_net_connect_init;
+	prclient->client.close_output = program_client_remote_close_output;
+	prclient->client.disconnect = program_client_remote_disconnect;
+	prclient->client.set.use_dotstream = TRUE;
+	prclient->address = p_strdup(pool, host);
+	prclient->port = port;
+	prclient->have_hostname = TRUE;
+	prclient->noreply = noreply;
+	return &prclient->client;
+}
+
+struct program_client *
+program_client_net_create_ips(const struct ip_addr *ips, size_t ips_count,
+			      in_port_t port,
+			      const char *const *args,
+			      const struct program_client_settings *set,
+			      bool noreply)
+{
+	struct program_client_remote *prclient;
+	const char *label;
+	pool_t pool;
+
+	i_assert(ips != NULL && ips_count > 0);
+
+	if (net_ipport2str(ips, port, &label) < 0)
+		i_unreached();
+	label = t_strconcat("tcp:", label, NULL);
+
+	pool = pool_alloconly_create("program client net", 1024);
+	prclient = p_new(pool, struct program_client_remote, 1);
+	program_client_init(&prclient->client, pool, label, args, set);
+	prclient->client.connect = program_client_net_connect_init;
+	prclient->client.close_output = program_client_remote_close_output;
+	prclient->client.disconnect = program_client_remote_disconnect;
+	prclient->client.switch_ioloop = program_client_remote_switch_ioloop;
+	prclient->client.set.use_dotstream = TRUE;
+	prclient->address = p_strdup(pool, net_ip2addr(ips));
+	prclient->ips = p_memdup(pool, ips,
+				 sizeof(struct ip_addr)*ips_count);
+	prclient->ips_count = ips_count;
+	prclient->port = port;
+	prclient->noreply = noreply;
+	return &prclient->client;
+}
diff --git a/src/lib-program-client/program-client.c b/src/lib-program-client/program-client.c
new file mode 100644
index 0000000..c6c6ff6
--- /dev/null
+++ b/src/lib-program-client/program-client.c
@@ -0,0 +1,745 @@
+/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "ioloop.h"
+#include "array.h"
+#include "str.h"
+#include "str-sanitize.h"
+#include "safe-mkstemp.h"
+#include "istream-private.h"
+#include "ostream-dot.h"
+#include "istream-dot.h"
+#include "ostream.h"
+#include "iostream-pump.h"
+#include "iostream-temp.h"
+#include "lib-signals.h"
+
+#include "program-client-private.h"
+
+#include <unistd.h>
+
+#define MAX_OUTPUT_BUFFER_SIZE 16384
+#define MAX_OUTPUT_MEMORY_BUFFER (1024*128)
+
+void program_client_set_label(struct program_client *pclient,
+			      const char *label)
+{
+	event_set_append_log_prefix(pclient->event,
+		t_strconcat("program ", label, ": ", NULL));
+}
+
+static void
+program_client_callback(struct program_client *pclient, int result,
+			void *context)
+{
+	program_client_callback_t *callback = pclient->callback;
+
+	pclient->callback = NULL;
+	if (pclient->destroying || callback == NULL)
+		return;
+	callback(result, context);
+}
+
+static void
+program_client_timeout(struct program_client *pclient)
+{
+	e_error(pclient->event,
+		"Execution timed out (> %u msecs)",
+		pclient->set.input_idle_timeout_msecs);
+	program_client_fail(pclient, PROGRAM_CLIENT_ERROR_RUN_TIMEOUT);
+}
+
+static void
+program_client_connect_timeout(struct program_client *pclient)
+{
+	e_error(pclient->event,
+		"Connection timed out (> %u msecs)",
+		pclient->set.client_connect_timeout_msecs);
+	program_client_fail(pclient, PROGRAM_CLIENT_ERROR_CONNECT_TIMEOUT);
+}
+
+static int
+program_client_connect(struct program_client *pclient)
+{
+	e_debug(pclient->event, "Establishing connection");
+
+	if (pclient->set.client_connect_timeout_msecs != 0) {
+		pclient->to = timeout_add(
+			pclient->set.client_connect_timeout_msecs,
+			program_client_connect_timeout, pclient);
+	}
+
+	return pclient->connect(pclient);
+}
+
+static int
+program_client_close_output(struct program_client *pclient)
+{
+	int ret;
+
+	o_stream_destroy(&pclient->program_output);
+	o_stream_destroy(&pclient->raw_program_output);
+	if ((ret = pclient->close_output(pclient)) < 0)
+		return -1;
+
+	return ret;
+}
+
+static void
+program_client_disconnect_extra_fds(struct program_client *pclient)
+{
+	struct program_client_extra_fd *efds;
+	unsigned int i, count;
+
+	if (!array_is_created(&pclient->extra_fds))
+		return;
+
+	efds = array_get_modifiable(&pclient->extra_fds, &count);
+	for(i = 0; i < count; i++) {
+		i_stream_unref(&efds[i].input);
+		io_remove(&efds[i].io);
+		if (efds[i].parent_fd != -1)
+			i_close_fd(&efds[i].parent_fd);
+	}
+
+	array_clear(&pclient->extra_fds);
+}
+
+static void
+program_client_do_disconnect(struct program_client *pclient)
+{
+	i_stream_destroy(&pclient->program_input);
+	o_stream_destroy(&pclient->program_output);
+	i_stream_destroy(&pclient->raw_program_input);
+	o_stream_destroy(&pclient->raw_program_output);
+
+	timeout_remove(&pclient->to);
+	io_remove(&pclient->io);
+	iostream_pump_destroy(&pclient->pump_in);
+	iostream_pump_destroy(&pclient->pump_out);
+
+	if (pclient->fd_out == pclient->fd_in)
+		pclient->fd_in = -1;
+	i_close_fd(&pclient->fd_in);
+	i_close_fd(&pclient->fd_out);
+
+	program_client_disconnect_extra_fds(pclient);
+
+	if (!pclient->disconnected)
+		e_debug(pclient->event, "Disconnected");
+	pclient->disconnected = TRUE;
+}
+
+void program_client_disconnected(struct program_client *pclient)
+{
+	program_client_do_disconnect(pclient);
+
+	if (pclient->other_error &&
+	    pclient->error == PROGRAM_CLIENT_ERROR_NONE) {
+		pclient->error = PROGRAM_CLIENT_ERROR_OTHER;
+	}
+
+	program_client_callback(pclient,
+		(pclient->error != PROGRAM_CLIENT_ERROR_NONE ?
+			PROGRAM_CLIENT_EXIT_STATUS_INTERNAL_FAILURE :
+			pclient->exit_status),
+		pclient->context);
+}
+
+static void
+program_client_disconnect(struct program_client *pclient, bool force)
+{
+	if (pclient->disconnected)
+		return;
+
+	program_client_do_disconnect(pclient);
+	pclient->disconnect(pclient, force);
+}
+
+void program_client_fail(struct program_client *pclient,
+			 enum program_client_error error)
+{
+	if (pclient->error != PROGRAM_CLIENT_ERROR_NONE)
+		return;
+
+	e_debug(pclient->event, "Failed to run program");
+
+	pclient->error = error;
+	program_client_disconnect(pclient, TRUE);
+}
+
+static bool
+program_client_input_pending(struct program_client *pclient)
+{
+	struct program_client_extra_fd *efds = NULL;
+	unsigned int count, i;
+
+	if (pclient->pump_in != NULL || pclient->pump_out != NULL)
+		return TRUE;
+
+	if (pclient->program_output != NULL &&
+	    !pclient->program_output->closed &&
+	    o_stream_get_buffer_used_size(pclient->program_output) > 0) {
+		return TRUE;
+	}
+	if (pclient->program_input != NULL &&
+	    !pclient->program_input->closed &&
+	    i_stream_have_bytes_left(pclient->program_input)) {
+		return TRUE;
+	}
+
+	if (array_is_created(&pclient->extra_fds)) {
+		efds = array_get_modifiable(&pclient->extra_fds, &count);
+		for(i = 0; i < count; i++) {
+			if (efds[i].input != NULL &&
+			    !efds[i].input->closed &&
+			    i_stream_have_bytes_left(efds[i].input)) {
+				return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+static void
+program_client_output_finished(struct program_client *pclient)
+{
+	e_debug(pclient->event, "Finished input to program");
+
+	/* check whether program i/o is finished */
+	if (!program_client_input_pending(pclient)) {
+		/* finished */
+		program_client_disconnect(pclient, FALSE);
+	/* close output towards program, so that it reads EOF */
+	} else if (program_client_close_output(pclient) < 0) {
+		program_client_fail(pclient,
+				    PROGRAM_CLIENT_ERROR_OTHER);
+	}
+}
+
+static int
+program_client_output_finish(struct program_client *pclient)
+{
+        struct ostream *output = pclient->program_output;
+	int ret = 0;
+
+	/* flush the output */
+	if ((ret=o_stream_finish(output)) < 0) {
+		e_error(pclient->event,
+			"write(%s) failed: %s",
+			o_stream_get_name(output),
+			o_stream_get_error(output));
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_IO);
+		return -1;
+	}
+	if (ret > 0)
+		program_client_output_finished(pclient);
+	return ret;
+}
+
+static void
+program_client_output_pump_finished(enum iostream_pump_status status,
+				    struct program_client *pclient)
+{
+	struct istream *input = pclient->input;
+	struct ostream *output = pclient->program_output;
+
+	i_assert(input != NULL);
+	i_assert(output != NULL);
+
+	switch (status) {
+	case IOSTREAM_PUMP_STATUS_INPUT_EOF:
+		break;
+	case IOSTREAM_PUMP_STATUS_INPUT_ERROR:
+		e_error(pclient->event,
+			"read(%s) failed: %s",
+			i_stream_get_name(input),
+			i_stream_get_error(input));
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_IO);
+		return;
+	case IOSTREAM_PUMP_STATUS_OUTPUT_ERROR:
+		e_error(pclient->event,
+			"write(%s) failed: %s",
+			o_stream_get_name(output),
+			o_stream_get_error(output));
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_IO);
+		return;
+	}
+
+	iostream_pump_destroy(&pclient->pump_out);
+
+	e_debug(pclient->event, "Finished streaming payload to program");
+
+	o_stream_set_flush_callback(pclient->program_output,
+		program_client_output_finish, pclient);
+	o_stream_set_flush_pending(pclient->program_output, TRUE);
+}
+
+static void
+program_client_input_finished(struct program_client *pclient)
+{
+	e_debug(pclient->event, "Finished output from program");
+
+	/* check whether program i/o is finished */
+	if (program_client_input_pending(pclient))
+		return;
+
+	/* finished */
+	program_client_disconnect(pclient, FALSE);
+}
+
+static void
+program_client_input_finish(struct program_client *pclient)
+{
+	struct istream *input = pclient->program_input;
+	const unsigned char *data;
+	size_t size;
+	int ret;
+
+	/* read (the remainder of) the raw program input */
+	while ((ret=i_stream_read_more(input, &data, &size)) > 0)
+		i_stream_skip(input, size);
+	if (ret == 0)
+		return;
+	if (ret < 0) {
+		if (input->stream_errno != 0) {
+			e_error(pclient->event,
+				"read(%s) failed: %s",
+				i_stream_get_name(input),
+				i_stream_get_error(input));
+			program_client_fail(pclient,
+					    PROGRAM_CLIENT_ERROR_IO);
+			return;
+		}
+	}
+
+	if (pclient->program_input != pclient->raw_program_input) {
+		/* return to raw program input */
+		i_stream_unref(&pclient->program_input);
+		pclient->program_input = pclient->raw_program_input;
+		i_stream_ref(pclient->program_input);
+
+		io_remove(&pclient->io);
+		pclient->io = io_add_istream(pclient->program_input,
+					     program_client_input_finish,
+					     pclient);
+		io_set_pending(pclient->io);
+	}
+
+	program_client_input_finished(pclient);
+}
+
+static void
+program_client_input_pump_finished(enum iostream_pump_status status,
+				   struct program_client *pclient)
+{
+	struct istream *input = pclient->program_input;
+	struct ostream *output = pclient->output;
+
+	i_assert(input != NULL);
+	i_assert(output != NULL);
+
+	switch (status) {
+	case IOSTREAM_PUMP_STATUS_INPUT_EOF:
+		break;
+	case IOSTREAM_PUMP_STATUS_INPUT_ERROR:
+		e_error(pclient->event,
+			"read(%s) failed: %s",
+			i_stream_get_name(input),
+			i_stream_get_error(input));
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_IO);
+		return;
+	case IOSTREAM_PUMP_STATUS_OUTPUT_ERROR:
+		e_error(pclient->event,
+			"write(%s) failed: %s",
+			o_stream_get_name(output),
+			o_stream_get_error(output));
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_IO);
+		return;
+	}
+
+	iostream_pump_destroy(&pclient->pump_in);
+
+	e_debug(pclient->event, "Finished streaming payload from program");
+
+	if (pclient->program_input != pclient->raw_program_input) {
+		/* return to raw program input */
+		i_stream_unref(&pclient->program_input);
+		pclient->program_input = pclient->raw_program_input;
+		i_stream_ref(pclient->program_input);
+	}
+
+	i_assert(pclient->io == NULL);
+	pclient->io = io_add_istream(pclient->program_input,
+				     program_client_input_finish, pclient);
+	io_set_pending(pclient->io);
+}
+
+static void
+program_client_extra_fd_input(struct program_client_extra_fd *efd)
+{
+	struct program_client *pclient = efd->pclient;
+
+	i_assert(efd->callback != NULL);
+	efd->callback(efd->context, efd->input);
+
+	if (efd->input->closed || !i_stream_have_bytes_left(efd->input)) {
+		if (!program_client_input_pending(pclient))
+			program_client_disconnect(pclient, FALSE);
+	}
+}
+
+void program_client_connected(struct program_client *pclient)
+{
+	e_debug(pclient->event, "Connected to program");
+
+	/* finish creating program input */
+	if (pclient->raw_program_input != NULL) {
+		struct istream *input = pclient->raw_program_input;
+
+		/* initialize dot input stream if required */
+		if (pclient->set.use_dotstream)
+			input = i_stream_create_dot(input, FALSE);
+		else
+			i_stream_ref(input);
+		pclient->program_input = input;
+	}
+	/* finish creating program output */
+	if (pclient->raw_program_output != NULL) {
+		struct ostream *output = pclient->raw_program_output;
+
+		/* initialize dot output stream if required */
+		if (pclient->set.use_dotstream)
+			output = o_stream_create_dot(output, FALSE);
+		else
+			o_stream_ref(output);
+		pclient->program_output = output;
+	}
+
+	pclient->start_time = ioloop_timeval;
+	timeout_remove(&pclient->to);
+	if (pclient->set.input_idle_timeout_msecs != 0) {
+		pclient->to =
+			timeout_add(pclient->set.input_idle_timeout_msecs,
+				    program_client_timeout, pclient);
+	}
+
+	/* run program input */
+	if (pclient->program_input == NULL) {
+		/* nothing */
+	} else if (pclient->output == NULL) {
+		i_assert(pclient->io == NULL);
+		pclient->io = io_add_istream(pclient->program_input,
+					     program_client_input_finish,
+					     pclient);
+		io_set_pending(pclient->io);
+	} else {
+		pclient->pump_in =
+			iostream_pump_create(pclient->program_input,
+					     pclient->output);
+		iostream_pump_set_completion_callback(pclient->pump_in,
+			program_client_input_pump_finished, pclient);
+		iostream_pump_start(pclient->pump_in);
+	}
+
+	/* run program output */
+	if (pclient->program_output == NULL) {
+		/* nothing */
+	} else if (pclient->input == NULL) {
+		o_stream_set_flush_callback(pclient->program_output,
+			program_client_output_finish, pclient);
+		o_stream_set_flush_pending(pclient->program_output, TRUE);
+	} else {
+		pclient->pump_out =
+			iostream_pump_create(pclient->input,
+					     pclient->program_output);
+		iostream_pump_set_completion_callback(pclient->pump_out,
+			program_client_output_pump_finished, pclient);
+		iostream_pump_start(pclient->pump_out);
+	}
+}
+
+void program_client_init(struct program_client *pclient, pool_t pool,
+			 const char *initial_label, const char *const *args,
+			 const struct program_client_settings *set)
+{
+	pclient->pool = pool;
+	if (args != NULL)
+		pclient->args = p_strarray_dup(pool, args);
+	pclient->fd_in = -1;
+	pclient->fd_out = -1;
+
+	if (set == NULL)
+		pclient->event = event_create(NULL);
+	else {
+		pclient->set = *set;
+		pclient->debug = set->debug;
+		pclient->set.dns_client_socket_path =
+			p_strdup(pool, set->dns_client_socket_path);
+		pclient->set.home = p_strdup(pool, set->home);
+
+		pclient->event = event_create(set->event);
+		event_set_forced_debug(pclient->event, set->debug);
+	}
+
+	program_client_set_label(pclient, initial_label);
+
+	e_debug(pclient->event, "Created");
+}
+
+void program_client_set_input(struct program_client *pclient,
+			      struct istream *input)
+{
+	i_stream_unref(&pclient->input);
+	if (input != NULL)
+		i_stream_ref(input);
+	pclient->input = input;
+}
+
+void program_client_set_output(struct program_client *pclient,
+			       struct ostream *output)
+{
+	o_stream_unref(&pclient->output);
+	if (output != NULL)
+		o_stream_ref(output);
+	pclient->output = output;
+	pclient->output_seekable = FALSE;
+}
+
+void program_client_set_output_seekable(struct program_client *pclient,
+					const char *temp_prefix)
+{
+	o_stream_unref(&pclient->output);
+	pclient->output = iostream_temp_create_sized(temp_prefix, 0,
+		"(program client seekable output)",
+		MAX_OUTPUT_MEMORY_BUFFER);
+	pclient->output_seekable = TRUE;
+}
+
+struct istream *
+program_client_get_output_seekable(struct program_client *pclient)
+{
+	i_assert(pclient->output_seekable);
+	return iostream_temp_finish(&pclient->output, IO_BLOCK_SIZE);
+}
+
+#undef program_client_set_extra_fd
+void program_client_set_extra_fd(struct program_client *pclient, int fd,
+				 program_client_fd_callback_t *callback,
+				 void *context)
+{
+	struct program_client_extra_fd *efds;
+	struct program_client_extra_fd *efd = NULL;
+	unsigned int i, count;
+	i_assert(fd > 1);
+
+	if (!array_is_created(&pclient->extra_fds))
+		p_array_init(&pclient->extra_fds, pclient->pool, 2);
+
+	efds = array_get_modifiable(&pclient->extra_fds, &count);
+	for(i = 0; i < count; i++) {
+		if (efds[i].child_fd == fd) {
+			efd = &efds[i];
+			break;
+		}
+	}
+
+	if (efd == NULL) {
+		efd = array_append_space(&pclient->extra_fds);
+		efd->pclient = pclient;
+		efd->child_fd = fd;
+		efd->parent_fd = -1;
+	}
+	efd->callback = callback;
+	efd->context = context;
+}
+
+void program_client_set_env(struct program_client *pclient, const char *name,
+			    const char *value)
+{
+	const char *env;
+
+	if (!array_is_created(&pclient->envs))
+		p_array_init(&pclient->envs, pclient->pool, 16);
+
+	env = p_strdup_printf(pclient->pool, "%s=%s", name, value);
+	array_push_back(&pclient->envs, &env);
+
+	e_debug(pclient->event, "Pass environment: %s",
+		str_sanitize(env, 256));
+}
+
+void program_client_init_streams(struct program_client *pclient)
+{
+	/* Create streams for normal program I/O */
+	if (pclient->fd_out >= 0) {
+		struct ostream *program_output;
+
+		program_output = o_stream_create_fd(pclient->fd_out,
+						    MAX_OUTPUT_BUFFER_SIZE);
+		o_stream_set_name(program_output, "program stdin");
+		o_stream_set_no_error_handling(program_output, TRUE);
+		pclient->raw_program_output = program_output;
+	}
+	if (pclient->fd_in >= 0) {
+		struct istream *program_input;
+
+		program_input = i_stream_create_fd(pclient->fd_in, SIZE_MAX);
+		i_stream_set_name(program_input, "program stdout");
+		pclient->raw_program_input = program_input;
+	}
+
+	/* Create streams for additional output through side-channel fds */
+	if (array_is_created(&pclient->extra_fds)) {
+		struct program_client_extra_fd *efds = NULL;
+		unsigned int count, i;
+
+		efds = array_get_modifiable(&pclient->extra_fds, &count);
+		for(i = 0; i < count; i++) {
+			i_assert(efds[i].parent_fd >= 0);
+			efds[i].input = i_stream_create_fd
+				(efds[i].parent_fd, SIZE_MAX);
+			i_stream_set_name(efds[i].input,
+				t_strdup_printf("program output fd=%d",
+						efds[i].child_fd));
+			efds[i].io = io_add(efds[i].parent_fd, IO_READ,
+					    program_client_extra_fd_input,
+					    &efds[i]);
+		}
+	}
+}
+
+void program_client_destroy(struct program_client **_pclient)
+{
+	struct program_client *pclient = *_pclient;
+
+	*_pclient = NULL;
+
+	e_debug(pclient->event, "Destroy");
+
+	pclient->destroying = TRUE;
+	pclient->callback = NULL;
+
+	program_client_disconnect(pclient, TRUE);
+
+	i_assert(pclient->callback == NULL);
+
+	i_stream_unref(&pclient->input);
+	o_stream_unref(&pclient->output);
+
+	i_stream_unref(&pclient->program_input);
+	o_stream_unref(&pclient->program_output);
+	i_stream_unref(&pclient->raw_program_input);
+	o_stream_unref(&pclient->raw_program_output);
+
+	if (pclient->destroy != NULL)
+		pclient->destroy(pclient);
+
+	event_unref(&pclient->event);
+
+	pool_unref(&pclient->pool);
+}
+
+void program_client_switch_ioloop(struct program_client *pclient)
+{
+	if (pclient->input != NULL)
+		i_stream_switch_ioloop(pclient->input);
+	if (pclient->program_input != NULL)
+		i_stream_switch_ioloop(pclient->program_input);
+	if (pclient->output != NULL)
+		o_stream_switch_ioloop(pclient->output);
+	if (pclient->program_output != NULL)
+		o_stream_switch_ioloop(pclient->program_output);
+	if (pclient->to != NULL)
+		pclient->to = io_loop_move_timeout(&pclient->to);
+	if (pclient->pump_in != NULL)
+		iostream_pump_switch_ioloop(pclient->pump_in);
+	if (pclient->pump_out != NULL)
+		iostream_pump_switch_ioloop(pclient->pump_out);
+	if (pclient->io != NULL)
+		pclient->io = io_loop_move_io(&pclient->io);
+	pclient->switch_ioloop(pclient);
+}
+
+int program_client_create(const char *uri, const char *const *args,
+			  const struct program_client_settings *set,
+			  bool noreply, struct program_client **pc_r,
+			  const char **error_r)
+{
+	if (str_begins(uri, "exec:")) {
+		*pc_r = program_client_local_create(uri+5, args, set);
+		return 0;
+	} else if (str_begins(uri, "unix:")) {
+		*pc_r = program_client_unix_create(uri+5, args, set, noreply);
+		return 0;
+	} else if (str_begins(uri, "tcp:")) {
+		const char *host;
+		in_port_t port;
+
+		if (net_str2hostport(uri+4, 0, &host, &port) < 0 ||
+		    port == 0) {
+			*error_r = t_strdup_printf(
+				"Invalid tcp syntax, "
+				"must be host:port in '%s'", uri+4);
+			return -1;
+		}
+		*pc_r = program_client_net_create(host, port, args, set,
+						  noreply);
+		return 0;
+	} else {
+		*error_r = t_strdup_printf(
+			"Unsupported program client scheme '%s'",
+			t_strcut(uri, ':'));
+		return -1;
+	}
+}
+
+static void
+program_client_run_callback(int result, int *context)
+{
+	*context = result;
+	io_loop_stop(current_ioloop);
+}
+
+int program_client_run(struct program_client *pclient)
+{
+	int ret = -2;
+	struct ioloop *prev_ioloop = current_ioloop;
+	struct ioloop *ioloop = io_loop_create();
+
+	program_client_switch_ioloop(pclient);
+
+	program_client_run_async(pclient, program_client_run_callback, &ret);
+
+	if (ret == -2) {
+		io_loop_run(ioloop);
+	}
+
+	io_loop_set_current(prev_ioloop);
+	program_client_switch_ioloop(pclient);
+	io_loop_set_current(ioloop);
+	io_loop_destroy(&ioloop);
+
+	if (pclient->error != PROGRAM_CLIENT_ERROR_NONE)
+		return -1;
+
+	return pclient->exit_status;
+}
+
+#undef program_client_run_async
+void program_client_run_async(struct program_client *pclient,
+			      program_client_callback_t *callback,
+			      void *context)
+{
+	i_assert(callback != NULL);
+
+	pclient->disconnected = FALSE;
+	pclient->exit_status = PROGRAM_CLIENT_EXIT_STATUS_SUCCESS;
+	pclient->error = PROGRAM_CLIENT_ERROR_NONE;
+
+	pclient->callback = callback;
+	pclient->context = context;
+	if (program_client_connect(pclient) < 0)
+		program_client_fail(pclient, PROGRAM_CLIENT_ERROR_IO);
+}
diff --git a/src/lib-program-client/program-client.h b/src/lib-program-client/program-client.h
new file mode 100644
index 0000000..ce6cdf9
--- /dev/null
+++ b/src/lib-program-client/program-client.h
@@ -0,0 +1,101 @@
+#ifndef PROGRAM_CLIENT_H
+#define PROGRAM_CLIENT_H
+
+#include "restrict-access.h"
+#include "net.h"
+
+struct program_client;
+
+enum program_client_exit_status {
+	PROGRAM_CLIENT_EXIT_STATUS_INTERNAL_FAILURE = -1,
+	PROGRAM_CLIENT_EXIT_STATUS_FAILURE = 0,
+	PROGRAM_CLIENT_EXIT_STATUS_SUCCESS = 1,
+};
+
+struct program_client_settings {
+	unsigned int client_connect_timeout_msecs;
+	unsigned int input_idle_timeout_msecs;
+	/* initialize with
+	   restrict_access_init(&set.restrict_set);
+	*/
+	struct restrict_access_settings restrict_set;
+	const char *dns_client_socket_path;
+	const char *home;
+
+	/* Event to use for the program client. */
+	struct event *event;
+
+	bool allow_root:1;
+	bool debug:1;
+	bool drop_stderr:1;
+	/* use o_stream_dot, which is mainly useful to make sure that an
+	   unexpectedly closed connection doesn't cause the partial input to
+	   be accepted as valid and complete program input. This is always
+	   enabled for 'net' program clients, which may likely encounter
+	   unexpected connection termination. */
+	bool use_dotstream:1;
+};
+
+typedef void program_client_fd_callback_t(void *context, struct istream *input);
+typedef void program_client_callback_t(enum program_client_exit_status status,
+				       void *context);
+
+struct program_client *
+program_client_local_create(const char *bin_path, const char *const *args,
+			    const struct program_client_settings *set)
+			    ATTR_NULL(3);
+struct program_client *
+program_client_unix_create(const char *socket_path, const char *const *args,
+			   const struct program_client_settings *set,
+			   bool noreply) ATTR_NULL(3);
+struct program_client *
+program_client_net_create(const char *host, in_port_t port,
+			  const char *const *args,
+			  const struct program_client_settings *set,
+			  bool noreply) ATTR_NULL(4);
+struct program_client *
+program_client_net_create_ips(const struct ip_addr *ips, size_t ips_count,
+			      in_port_t port, const char *const *args,
+			      const struct program_client_settings *set,
+			      bool noreply) ATTR_NULL(5);
+int program_client_create(const char *uri, const char *const *args,
+			  const struct program_client_settings *set,
+			  bool noreply, struct program_client **pc_r,
+			  const char **error_r) ATTR_NULL(3);
+
+void program_client_destroy(struct program_client **_pclient);
+
+void program_client_set_input(struct program_client *pclient,
+	struct istream *input);
+void program_client_set_output(struct program_client *pclient,
+	struct ostream *output);
+
+void program_client_set_output_seekable(struct program_client *pclient,
+	const char *temp_prefix);
+struct istream *
+program_client_get_output_seekable(struct program_client *pclient);
+
+void program_client_switch_ioloop(struct program_client *pclient);
+
+/* Program provides side-channel output through an extra fd */
+void program_client_set_extra_fd(struct program_client *pclient, int fd,
+	 program_client_fd_callback_t * callback, void *context);
+#define program_client_set_extra_fd(pclient, fd, callback, context) \
+	program_client_set_extra_fd(pclient, fd - \
+		CALLBACK_TYPECHECK(callback, \
+			void (*)(typeof(context), struct istream *input)), \
+		(program_client_fd_callback_t *)callback, context)
+
+void program_client_set_env(struct program_client *pclient,
+	const char *name, const char *value);
+
+enum program_client_exit_status
+program_client_run(struct program_client *pclient);
+void program_client_run_async(struct program_client *pclient,
+			      program_client_callback_t *, void*);
+#define program_client_run_async(pclient, callback, context) \
+	program_client_run_async(pclient, (program_client_callback_t*)callback, \
+		1 ? context : CALLBACK_TYPECHECK(callback, \
+			void (*)(enum program_client_exit_status, typeof(context))))
+
+#endif
diff --git a/src/lib-program-client/test-program-client-local.c b/src/lib-program-client/test-program-client-local.c
new file mode 100644
index 0000000..2040b15
--- /dev/null
+++ b/src/lib-program-client/test-program-client-local.c
@@ -0,0 +1,289 @@
+/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "test-lib.h"
+#include "buffer.h"
+#include "str.h"
+#include "istream.h"
+#include "istream-concat.h"
+#include "ostream.h"
+#include "lib-signals.h"
+#include "program-client.h"
+
+#include <unistd.h>
+
+static const char *pclient_test_io_string = 
+	"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+	"Praesent vehicula ac leo vel placerat. Nullam placerat \n"
+	"volutpat leo, sed ultricies felis pulvinar quis. Nam \n"
+	"tempus, augue ut tempor cursus, neque felis commodo lacus, \n"
+	"sit amet tincidunt arcu justo vel augue. Proin dapibus \n"
+	"vulputate maximus. Mauris congue lacus felis, sed varius \n"
+	"leo finibus sagittis. Cum sociis natoque penatibus et magnis \n"
+	"dis parturient montes, nascetur ridiculus mus. Aliquam \n"
+	"laoreet arcu a hendrerit consequat. Duis vitae erat tellus.";
+
+static struct program_client_settings pc_set = {
+	.client_connect_timeout_msecs = 10000,
+	.input_idle_timeout_msecs = 5000,
+	.debug = FALSE,
+	.restrict_set = {
+		.uid = (uid_t)-1,
+		.gid = (gid_t)-1,
+	},
+	/* we need to permit root when running make check as root */
+	.allow_root = TRUE,
+};
+
+static void test_program_success(void)
+{
+	struct program_client *pc;
+
+	const char *const args[] = {
+		"hello", "world", NULL
+	};
+
+	test_begin("test_program_success");
+
+	pc = program_client_local_create("/bin/echo", args, &pc_set);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	test_assert(program_client_run(pc) == 1);
+	test_assert(strcmp(str_c(output), "hello world\n") == 0);
+
+	program_client_destroy(&pc);
+
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	test_end();
+}
+
+static void test_program_io_sync(void)
+{
+	struct program_client *pc;
+
+	const char *const args[] = {
+		NULL
+	};
+
+	test_begin("test_program_io (sync)");
+
+	pc = program_client_local_create("/bin/cat", args, &pc_set);
+
+	struct istream *is = test_istream_create(pclient_test_io_string);
+	program_client_set_input(pc, is);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	test_assert(program_client_run(pc) == 1);
+	test_assert(strcmp(str_c(output), pclient_test_io_string) == 0);
+
+	program_client_destroy(&pc);
+
+	i_stream_unref(&is);
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	test_end();
+}
+
+static void test_program_io_async_callback(int result, int *ret)
+{
+	*ret = result;
+	test_assert(result == 1);
+	io_loop_stop(current_ioloop);
+}
+
+static void test_program_io_async(void)
+{
+	struct ioloop *prev_ioloop, *ioloop;
+	struct program_client *pc;
+	int ret = -2;
+
+	const char *const args[] = {
+		NULL
+	};
+
+	test_begin("test_program_io (async)");
+
+	prev_ioloop = current_ioloop;
+	ioloop = io_loop_create();
+
+	pc = program_client_local_create("/bin/cat", args, &pc_set);
+
+	struct istream *is = test_istream_create(pclient_test_io_string);
+	program_client_set_input(pc, is);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	program_client_run_async(pc, test_program_io_async_callback, &ret);
+
+	if (ret == -2)
+		io_loop_run(ioloop);
+
+	test_assert(strcmp(str_c(output), pclient_test_io_string) == 0);
+
+	program_client_destroy(&pc);
+
+	i_stream_unref(&is);
+	o_stream_unref(&os);
+	buffer_free(&output);
+	io_loop_set_current(prev_ioloop);
+	io_loop_set_current(ioloop);
+	io_loop_destroy(&ioloop);
+
+	test_end();
+}
+
+static void test_program_failure(void)
+{
+	struct program_client *pc;
+
+	const char *const args[] = {
+		NULL
+	};
+
+	test_begin("test_program_failure");
+
+	pc = program_client_local_create("/bin/false", args, &pc_set);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	test_assert(program_client_run(pc) == 0);
+	test_assert(strcmp(str_c(output), "") == 0);
+
+	program_client_destroy(&pc);
+
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	test_end();
+}
+
+static void test_program_io_big(void)
+{
+	struct program_client *pc;
+
+	/* nasty program that reads data in bits with intermittent delays
+	   and then finally reads the rest in one go. */
+	const char *const args[] = {
+		"-c",
+		"(dd bs=10240 count=1; sleep 0.1; "
+		 "dd bs=10240 count=1; sleep 0.1; "
+		 "dd bs=10240 count=1; sleep 0.1; "
+		 "dd bs=10240 count=1; sleep 0.1; "
+		 "dd bs=10240 count=1; sleep 0.1; "
+		 "dd bs=10240 count=1; sleep 0.1; cat) 2>/dev/null",
+		NULL
+	};
+
+	test_begin("test_program_io (big)");
+
+	pc = program_client_local_create("/bin/sh", args, &pc_set);
+
+	/* make big input with only a small reference string */
+	struct istream *is1 = test_istream_create(pclient_test_io_string);
+	struct istream *in1[11] = {is1, is1, is1, is1, is1,
+				   is1, is1, is1, is1, is1, NULL};
+	struct istream *is2 = i_stream_create_concat(in1);
+	struct istream *in2[11] = {is2, is2, is2, is2, is2,
+				   is2, is2, is2, is2, is2, NULL};
+	struct istream *is3 = i_stream_create_concat(in2);
+	struct istream *in3[11] = {is3, is3, is3, is3, is3,
+				   is3, is3, is3, is3, is3, NULL};
+	struct istream *is = i_stream_create_concat(in3);
+
+	i_stream_unref(&is1);
+	i_stream_unref(&is2);
+	i_stream_unref(&is3);
+
+	program_client_set_input(pc, is);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	test_assert(program_client_run(pc) == 1);
+
+	test_assert(str_len(output) == strlen(pclient_test_io_string)*10*10*10);
+
+	program_client_destroy(&pc);
+
+	i_stream_unref(&is);
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	test_end();
+}
+
+static void test_program_wait_no_io(void)
+{
+	struct program_client_settings set = pc_set;
+	struct program_client *pc;
+
+	/* nasty program that reads data in bits with intermittent delays
+	   and then finally reads the rest in one go. */
+	const char *const args[] = {
+		"-c", "sleep 1",
+		NULL
+	};
+
+	test_begin("test_program_wait (no timeout, no I/O)");
+
+	set.client_connect_timeout_msecs = 0;
+	set.input_idle_timeout_msecs = 0;
+	pc = program_client_local_create("/bin/sh", args, &set);
+
+	test_assert(program_client_run(pc) == 1);
+
+	program_client_destroy(&pc);
+
+	test_end();
+}
+
+int main(int argc, char *argv[])
+{
+	struct ioloop *ioloop;
+	int ret, c;
+
+	void (*tests[])(void) = {
+		test_program_success,
+		test_program_io_sync,
+		test_program_io_async,
+		test_program_io_big,
+		test_program_failure,
+		test_program_wait_no_io,
+		NULL
+	};
+
+	lib_init();
+
+	while ((c = getopt(argc, argv, "D")) > 0) {
+		switch (c) {
+		case 'D':
+			pc_set.debug = TRUE;
+			break;
+		default:
+			i_fatal("Usage: %s [-D]", argv[0]);
+		}
+	}
+
+	ioloop = io_loop_create();
+	lib_signals_init();
+	ret = test_run(tests);
+	lib_signals_deinit();
+	io_loop_destroy(&ioloop);
+
+	lib_deinit();
+	return ret;
+}
diff --git a/src/lib-program-client/test-program-client-net.c b/src/lib-program-client/test-program-client-net.c
new file mode 100644
index 0000000..ed7d68d
--- /dev/null
+++ b/src/lib-program-client/test-program-client-net.c
@@ -0,0 +1,545 @@
+/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "test-lib.h"
+#include "mempool.h"
+#include "buffer.h"
+#include "str.h"
+#include "array.h"
+#include "istream.h"
+#include "ostream.h"
+#include "istream-dot.h"
+#include "ostream-dot.h"
+#include "net.h"
+#include "iostream-temp.h"
+#include "program-client.h"
+
+#include <unistd.h>
+
+static const char *pclient_test_io_string =
+	"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\r\n"
+	"Praesent vehicula ac leo vel placerat. Nullam placerat \r\n"
+	"volutpat leo, sed ultricies felis pulvinar quis. Nam \r\n"
+	"tempus, augue ut tempor cursus, neque felis commodo lacus, \r\n"
+	"sit amet tincidunt arcu justo vel augue. Proin dapibus \r\n"
+	"vulputate maximus. Mauris congue lacus felis, sed varius \r\n"
+	"leo finibus sagittis. Cum sociis natoque penatibus et magnis \r\n"
+	"dis parturient montes, nascetur ridiculus mus. Aliquam \r\n"
+	"laoreet arcu a hendrerit consequat. Duis vitae erat tellus.";
+
+static struct program_client_settings pc_set = {
+	.client_connect_timeout_msecs = 5000,
+	.input_idle_timeout_msecs = 10000,
+	.debug = FALSE,
+};
+
+static struct test_server {
+	struct ioloop *ioloop;
+	struct io *io;
+	struct timeout *to;
+	struct test_client *client;
+	int listen_fd;
+	in_port_t port;
+	unsigned int io_loop_ref;
+} test_globals;
+
+struct test_client {
+	pool_t pool;
+	int fd;
+	struct io *io;
+	struct istream *in;
+	struct ostream *out;
+	struct ostream *os_body;
+	struct istream *is_body;
+	struct istream *body;
+	ARRAY_TYPE(const_string) args;
+	enum {
+		CLIENT_STATE_INIT,
+		CLIENT_STATE_VERSION,
+		CLIENT_STATE_ARGS,
+		CLIENT_STATE_BODY,
+		CLIENT_STATE_FINISH
+	} state;
+};
+
+static void test_program_io_loop_run(void)
+{
+	if (test_globals.io_loop_ref++ == 0)
+		io_loop_run(current_ioloop);
+}
+
+static void test_program_io_loop_stop(void)
+{
+	if (--test_globals.io_loop_ref == 0)
+		io_loop_stop(current_ioloop);
+}
+
+static void test_program_client_destroy(struct test_client **_client)
+{
+	struct test_client *client = *_client;
+	*_client = NULL;
+
+	if (o_stream_finish(client->out) < 0)
+		i_error("output error: %s", o_stream_get_error(client->out));
+
+	io_remove(&client->io);
+	o_stream_unref(&client->out);
+	i_stream_unref(&client->in);
+	o_stream_unref(&client->os_body);
+	i_stream_unref(&client->is_body);
+	i_stream_unref(&client->body);
+	i_close_fd(&client->fd);
+	pool_unref(&client->pool);
+	test_globals.client = NULL;
+	test_program_io_loop_stop();
+}
+
+static int
+test_program_input_handle(struct test_client *client, const char *line)
+{
+	int cmp = -1;
+	const char *arg;
+
+	switch(client->state) {
+	case CLIENT_STATE_INIT:
+		cmp = strncmp(line, "VERSION\tscript\t", 15);
+		test_assert(cmp == 0);
+		if (cmp == 0)
+			client->state = CLIENT_STATE_VERSION;
+		else
+			return -1;
+		break;
+	case CLIENT_STATE_VERSION:
+		if (strcmp(line, "noreply") == 0 ||
+		    strcmp(line, "-") == 0)
+			cmp = 0;
+		test_assert(cmp == 0);
+		if (cmp == 0)
+			client->state = CLIENT_STATE_ARGS;
+		else
+			return -1;
+		break;
+	case CLIENT_STATE_ARGS:
+		if (strcmp(line, "") == 0) {
+			array_append_zero(&client->args);
+			client->state = CLIENT_STATE_BODY;
+			return 0;
+		}
+		arg = p_strdup(client->pool, line);
+		array_push_back(&client->args, &arg);
+		break;
+	case CLIENT_STATE_BODY:
+		if (client->os_body == NULL) {
+			client->os_body = iostream_temp_create_named(
+				".dovecot.test.", 0, "test_program_input body");
+		}
+		if (client->is_body == NULL)
+			client->is_body = i_stream_create_dot(client->in, FALSE);
+		switch (o_stream_send_istream(client->os_body,
+					      client->is_body)) {
+		case OSTREAM_SEND_ISTREAM_RESULT_ERROR_OUTPUT:
+			i_panic("Cannot write to ostream-temp: %s",
+				o_stream_get_error(client->os_body));
+		case OSTREAM_SEND_ISTREAM_RESULT_ERROR_INPUT:
+			i_warning("Client stream error: %s",
+				  i_stream_get_error(client->is_body));
+			return -1;
+		case OSTREAM_SEND_ISTREAM_RESULT_WAIT_INPUT:
+			break;
+		case OSTREAM_SEND_ISTREAM_RESULT_FINISHED:
+			client->body = iostream_temp_finish(&client->os_body,
+							    SIZE_MAX);
+			i_stream_unref(&client->is_body);
+			client->state = CLIENT_STATE_FINISH;
+			return 0;
+		case OSTREAM_SEND_ISTREAM_RESULT_WAIT_OUTPUT:
+			i_panic("Cannot write to ostream-temp");
+		}
+		break;
+	case CLIENT_STATE_FINISH:
+		if (i_stream_read_eof(client->in))
+			return 1;
+		break;
+	}
+	return 0;
+}
+
+static void test_program_end(struct test_client *client)
+{
+	timeout_remove(&test_globals.to);
+	test_program_client_destroy(&client);
+}
+
+static void test_program_run(struct test_client *client)
+{
+	const char *const *args;
+	bool disconnect_later = FALSE;
+	unsigned int count;
+
+	struct ostream *os;
+
+	timeout_remove(&test_globals.to);
+	test_assert(array_is_created(&client->args));
+	if (array_is_created(&client->args)) {
+		args = array_get(&client->args, &count);
+		test_assert(count > 0);
+		if (count >= 2) {
+			if (strcmp(args[0], "test_program_success") == 0) {
+				/* Return hello world */
+				i_assert(count >= 3);
+				o_stream_nsend_str(client->out,
+					t_strdup_printf("%s %s\r\n.\n+\n",
+						   	args[1], args[2]));
+			} else if (strcmp(args[0], "test_program_io") == 0) {
+				os = o_stream_create_dot(client->out, FALSE);
+				o_stream_nsend_istream(os, client->body);
+				test_assert(o_stream_finish(os) > 0);
+				o_stream_unref(&os);
+				o_stream_nsend_str(client->out, "+\n");
+			} else if (strcmp(args[0],
+					  "test_program_failure") == 0) {
+				o_stream_nsend_str(client->out, ".\n-\n");
+			}
+		} else
+			o_stream_nsend_str(client->out, ".\n-\n");
+		if (count >= 3 && strcmp(args[1], "slow_disconnect") == 0)
+			disconnect_later = TRUE;
+	}
+
+	test_assert(o_stream_flush(client->out) > 0);
+
+	if (!disconnect_later)
+		test_program_client_destroy(&client);
+	else {
+		test_globals.to = timeout_add_short(
+			500, test_program_end, client);
+	}
+}
+
+static void test_program_input(struct test_client *client)
+{
+	const char *line = "";
+	int ret = 0;
+
+	while (ret >= 0) {
+		if (client->state >= CLIENT_STATE_BODY) {
+			ret = test_program_input_handle(client, NULL);
+			break;
+		}
+		while (client->state < CLIENT_STATE_BODY) {
+			line = i_stream_read_next_line(client->in);
+			if (line == NULL) {
+				ret = 0;
+				break;
+			}
+			ret = test_program_input_handle(client, line);
+			if (ret < 0) {
+				i_warning("Client sent invalid line: %s", line);
+				break;
+			}
+		}
+	}
+
+	if (ret < 0 || client->in->stream_errno != 0) {
+		test_program_client_destroy(&client);
+		return;
+	}
+	if (!client->in->eof)
+		return;
+
+	if (client->state < CLIENT_STATE_FINISH)
+		i_warning("Client prematurely disconnected");
+
+	io_remove(&client->io);
+	/* Incur slight delay to check if the connection gets prematurely
+	   closed. */
+	test_globals.to = timeout_add_short(100, test_program_run, client);
+}
+
+static void test_program_connected(struct test_server *server)
+{
+	struct test_client *client;
+	int fd;
+
+	i_assert(server->client == NULL);
+	fd = net_accept(server->listen_fd, NULL, NULL); /* makes no sense on net */
+	if (fd < 0)
+		i_fatal("Failed to accept connection: %m");
+
+	net_set_nonblock(fd, TRUE);
+
+	pool_t pool = pool_alloconly_create("test_program client", 1024);
+	client = p_new(pool, struct test_client, 1);
+	client->pool = pool;
+	client->fd = fd;
+	client->in = i_stream_create_fd(fd, SIZE_MAX);
+	client->out = o_stream_create_fd(fd, SIZE_MAX);
+	client->io = io_add_istream(client->in, test_program_input, client);
+	p_array_init(&client->args, client->pool, 2);
+	server->client = client;
+
+	test_program_io_loop_run();
+}
+
+static void test_program_setup(void)
+{
+	struct ip_addr ip;
+
+	test_begin("test_program_setup");
+
+	test_globals.ioloop = io_loop_create();
+	io_loop_set_current(test_globals.ioloop);
+
+	/* Create listener */
+	test_globals.port = 0;
+	test_assert(net_addr2ip("127.0.0.1", &ip) == 0);
+
+	test_globals.listen_fd = net_listen(&ip, &test_globals.port, 1);
+
+	if (test_globals.listen_fd < 0)
+		i_fatal("Cannot create TCP listener: %m");
+
+	test_globals.io = io_add(test_globals.listen_fd, IO_READ,
+				 test_program_connected, &test_globals);
+	test_end();
+}
+
+static void test_program_teardown(void)
+{
+	test_begin("test_program_teardown");
+
+	if (test_globals.client != NULL)
+		test_program_client_destroy(&test_globals.client);
+	io_remove(&test_globals.io);
+	i_close_fd(&test_globals.listen_fd);
+	io_loop_destroy(&test_globals.ioloop);
+	test_end();
+}
+
+static void test_program_async_callback(enum program_client_exit_status result,
+					int *ret)
+{
+	*ret = (int)result;
+	test_program_io_loop_stop();
+}
+
+static void test_program_success(void)
+{
+	struct program_client *pc;
+	int ret = -2;
+
+	const char *const args[] = {
+		"test_program_success", "hello", "world", NULL
+	};
+
+	test_begin("test_program_success");	
+
+	pc = program_client_net_create("127.0.0.1", test_globals.port, args,
+				       &pc_set, FALSE);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	if (ret == -2)
+		test_program_io_loop_run();
+
+	test_assert(ret == 1);
+	test_assert(strcmp(str_c(output), "hello world") == 0);
+
+	program_client_destroy(&pc);
+
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	i_assert(test_globals.client == NULL);
+
+	test_end();
+}
+
+static void test_program_io_common(const char *const *args)
+{
+	struct program_client *pc;
+	int ret = -2;
+
+	pc = program_client_net_create("127.0.0.1", test_globals.port, args,
+				       &pc_set, FALSE);
+
+	struct istream *is = test_istream_create(pclient_test_io_string);
+	program_client_set_input(pc, is);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	if (ret == -2)
+		test_program_io_loop_run();
+
+	test_assert(ret == 1);
+	test_assert(strcmp(str_c(output), pclient_test_io_string) == 0);
+
+	program_client_destroy(&pc);
+
+	i_stream_unref(&is);
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	i_assert(test_globals.client == NULL);
+}
+
+static void test_program_io(void)
+{
+	const char *args[3] = {
+		"test_program_io", NULL, NULL
+	};
+
+	test_begin("test_program_io (async)");
+
+	test_program_io_common(args);
+
+	test_end();
+
+	args[1] = "slow_disconnect";
+
+	test_begin("test_program_io (async, slow disconnect)");
+
+	test_program_io_common(args);
+
+	test_end();
+}
+
+static void test_program_failure(void)
+{
+	struct program_client *pc;
+	int ret = -2;
+
+	const char *const args[] = {
+		"test_program_failure", NULL
+	};
+
+	test_begin("test_program_failure");
+
+	pc = program_client_net_create("127.0.0.1", test_globals.port, args,
+				       &pc_set, FALSE);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	if (ret == -2)
+		test_program_io_loop_run();
+
+	test_assert(ret == 0);
+
+	program_client_destroy(&pc);
+
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	i_assert(test_globals.client == NULL);
+
+	test_end();
+}
+
+static void test_program_noreply(void)
+{
+	struct program_client *pc;
+	int ret = -2;
+
+	const char *const args[] = {
+		"test_program_success", "hello", "world", NULL
+	};
+
+	test_begin("test_program_noreply");
+
+	pc = program_client_net_create("127.0.0.1", test_globals.port, args,
+				       &pc_set, TRUE);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	if (ret == -2)
+		test_program_io_loop_run();
+
+	test_assert(ret == 1);
+
+	program_client_destroy(&pc);
+
+	i_assert(test_globals.client == NULL);
+
+	test_end();
+}
+
+static void test_program_refused(void)
+{
+	struct program_client *pc;
+	struct ip_addr ips[4];
+	int ret = -2;
+
+	const char *const args[] = {
+		"test_program_success", "hello", "world", NULL
+	};
+
+	test_begin("test_program_refused");
+
+	if (net_addr2ip("::1", &ips[0]) < 0 ||
+	    net_addr2ip("127.0.0.3", &ips[1]) < 0 ||
+	    net_addr2ip("127.0.0.2", &ips[2]) < 0 ||
+	    net_addr2ip("127.0.0.1", &ips[3]) < 0) {
+		i_fatal("Cannot convert addresses");
+	}
+	
+	pc = program_client_net_create_ips(ips, N_ELEMENTS(ips),
+					   test_globals.port, args,
+					   &pc_set, TRUE);
+
+	test_expect_errors(N_ELEMENTS(ips)-1);
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	if (ret == -2)
+		test_program_io_loop_run();
+
+	test_assert(ret == 1);
+
+	program_client_destroy(&pc);
+
+	test_end();
+}
+
+int main(int argc, char *argv[])
+{
+	int ret, c;
+
+	void (*tests[])(void) = {
+		test_program_setup,
+		test_program_success,
+		test_program_io,
+		test_program_failure,
+		test_program_noreply,
+		test_program_refused,
+		test_program_teardown,
+		NULL
+	};
+
+	lib_init();
+
+	while ((c = getopt(argc, argv, "D")) > 0) {
+		switch (c) {
+		case 'D':
+			pc_set.debug = TRUE;
+			break;
+		default:
+			i_fatal("Usage: %s [-D]", argv[0]);
+		}
+	}
+
+	ret = test_run(tests);
+
+	lib_deinit();
+	return ret;
+}
diff --git a/src/lib-program-client/test-program-client-unix.c b/src/lib-program-client/test-program-client-unix.c
new file mode 100644
index 0000000..e524c88
--- /dev/null
+++ b/src/lib-program-client/test-program-client-unix.c
@@ -0,0 +1,441 @@
+/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "test-lib.h"
+#include "mempool.h"
+#include "buffer.h"
+#include "str.h"
+#include "array.h"
+#include "istream.h"
+#include "ostream.h"
+#include "net.h"
+#include "iostream-temp.h"
+#include "program-client.h"
+
+#include <unistd.h>
+
+static const char *TEST_SOCKET = "program-client-test.sock";
+static const char *pclient_test_io_string =
+	"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+	"Praesent vehicula ac leo vel placerat. Nullam placerat \n"
+	"volutpat leo, sed ultricies felis pulvinar quis. Nam \n"
+	"tempus, augue ut tempor cursus, neque felis commodo lacus, \n"
+	"sit amet tincidunt arcu justo vel augue. Proin dapibus \n"
+	"vulputate maximus. Mauris congue lacus felis, sed varius \n"
+	"leo finibus sagittis. Cum sociis natoque penatibus et magnis \n"
+	"dis parturient montes, nascetur ridiculus mus. Aliquam \n"
+	"laoreet arcu a hendrerit consequat. Duis vitae erat tellus.";
+
+static struct program_client_settings pc_set = {
+	.client_connect_timeout_msecs = 1000,
+	.input_idle_timeout_msecs = 5000,
+	.debug = FALSE,
+};
+
+static struct test_server {
+	struct ioloop *ioloop;
+	struct io *io;
+	struct timeout *to;
+	struct test_client *client;
+	int listen_fd;
+} test_globals;
+
+struct test_client {
+	pool_t pool;
+	int fd;
+	struct io *io;
+	struct istream *in;
+	struct ostream *out;
+	struct ostream *os_body;
+	struct istream *body;
+	ARRAY_TYPE(const_string) args;
+	enum {
+		CLIENT_STATE_INIT,
+		CLIENT_STATE_VERSION,
+		CLIENT_STATE_ARGS,
+		CLIENT_STATE_BODY
+	} state;
+};
+
+static void test_program_client_destroy(struct test_client **_client)
+{
+	struct test_client *client = *_client;
+	*_client = NULL;
+
+	if (o_stream_finish(client->out) < 0)
+		i_error("output error: %s", o_stream_get_error(client->out));
+
+	io_remove(&client->io);
+	o_stream_unref(&client->out);
+	i_stream_unref(&client->in);
+	o_stream_unref(&client->os_body);
+	i_stream_unref(&client->body);
+	i_close_fd(&client->fd);
+	pool_unref(&client->pool);
+	test_globals.client = NULL;
+}
+
+static int
+test_program_input_handle(struct test_client *client, const char *line)
+{
+	int cmp = -1;
+	const char *arg;
+
+	switch(client->state) {
+	case CLIENT_STATE_INIT:
+		cmp = strncmp(line, "VERSION\tscript\t", 15);
+		test_assert(cmp == 0);
+		if (cmp == 0)
+			client->state = CLIENT_STATE_VERSION;
+		else
+			return -1;
+		break;
+	case CLIENT_STATE_VERSION:
+		if (strcmp(line, "noreply") == 0 ||
+		    strcmp(line, "-") == 0)
+			cmp = 0;
+		test_assert(cmp == 0);
+		if (cmp == 0)
+			client->state = CLIENT_STATE_ARGS;
+		else
+			return -1;
+		break;
+	case CLIENT_STATE_ARGS:
+		if (strcmp(line, "") == 0) {
+			array_append_zero(&client->args);
+			client->state = CLIENT_STATE_BODY;
+			return 0;
+		}
+		arg = p_strdup(client->pool, line);
+		array_push_back(&client->args, &arg);
+		break;
+	case CLIENT_STATE_BODY:
+		if (client->os_body == NULL) {
+			client->os_body = iostream_temp_create_named(
+				".dovecot.test.", 0, "test_program_input body");
+		}
+		switch (o_stream_send_istream(client->os_body, client->in)) {
+		case OSTREAM_SEND_ISTREAM_RESULT_ERROR_OUTPUT:
+			i_panic("Cannot write to ostream-temp: %s",
+				o_stream_get_error(client->os_body));
+		case OSTREAM_SEND_ISTREAM_RESULT_ERROR_INPUT:
+			i_warning("Client stream error: %s",
+				  i_stream_get_error(client->in));
+			return -1;
+		case OSTREAM_SEND_ISTREAM_RESULT_WAIT_INPUT:
+			i_debug("waiting for input");
+			break;
+		case OSTREAM_SEND_ISTREAM_RESULT_FINISHED:
+			client->body = iostream_temp_finish(&client->os_body,
+							    SIZE_MAX);
+			return 1;
+		case OSTREAM_SEND_ISTREAM_RESULT_WAIT_OUTPUT:
+			i_panic("Cannot write to ostream-temp");
+		}
+		break;
+	}
+	return 0;
+}
+
+static void test_program_end(struct test_client *client)
+{
+	timeout_remove(&test_globals.to);
+	test_program_client_destroy(&client);
+}
+
+static void test_program_run(struct test_client *client)
+{
+	const char *const *args;
+	unsigned int count;
+
+	timeout_remove(&test_globals.to);
+
+	args = array_get(&client->args, &count);
+	test_assert(count >= 2);
+	if (strcmp(args[0], "test_program_success") == 0) {
+		/* Return hello world */
+		test_assert(count >= 3);
+		o_stream_nsend_str(client->out, t_strdup_printf("%s %s\n+\n",
+				   args[1], args[2]));
+	} else if (strcmp(args[0], "test_program_io") == 0) {
+		o_stream_nsend_istream(client->out, client->body);
+		o_stream_nsend_str(client->out, "+\n");
+	} else if (strcmp(args[0], "test_program_failure") == 0) {
+		o_stream_nsend_str(client->out, "-\n");
+	}
+	if (count < 3 || strcmp(args[1], "slow_disconnect") != 0)
+		test_program_client_destroy(&client);
+	else {
+		test_globals.to = timeout_add_short(
+			500, test_program_end, client);
+	}
+}
+
+static void test_program_input(struct test_client *client)
+{
+	const char *line = "";
+	int ret = 0;
+
+	while (ret >= 0) {
+		if (client->state == CLIENT_STATE_BODY) {
+			ret = test_program_input_handle(client, NULL);
+			break;
+		}
+		while (client->state < CLIENT_STATE_BODY) {
+			line = i_stream_read_next_line(client->in);
+			if (line == NULL) {
+				ret = 0;
+				break;
+			}
+			ret = test_program_input_handle(client, line);
+			if (ret < 0) {
+				i_warning("Client sent invalid line: %s", line);
+				break;
+			}
+		}
+	}
+
+	if (ret < 0 || client->in->stream_errno != 0) {
+		test_program_client_destroy(&client);
+		return;
+	}
+	if (!client->in->eof)
+		return;
+
+	if (client->state != CLIENT_STATE_BODY)
+		i_warning("Client prematurely disconnected");
+
+	io_remove(&client->io);
+	/* Incur slight delay to check if the connection gets prematurely
+	   closed. */
+	test_globals.to = timeout_add_short(100, test_program_run, client);
+}
+
+static void test_program_connected(struct test_server *server)
+{
+	struct test_client *client;
+	int fd;
+
+	i_assert(server->client == NULL);
+	fd = net_accept(server->listen_fd, NULL, NULL); /* makes no sense on unix */
+	if (fd < 0)
+		i_fatal("Failed to accept connection: %m");
+
+	net_set_nonblock(fd, TRUE);
+
+	pool_t pool = pool_alloconly_create("test_program client", 1024);
+	client = p_new(pool, struct test_client, 1);
+	client->pool = pool;
+	client->fd = fd;
+	client->in = i_stream_create_fd(fd, SIZE_MAX);
+	client->out = o_stream_create_fd(fd, SIZE_MAX);
+	client->io = io_add_istream(client->in, test_program_input, client);
+	p_array_init(&client->args, client->pool, 2);
+	server->client = client;
+}
+
+static void test_program_setup(void)
+{
+	test_begin("test_program_setup");
+
+	test_globals.ioloop = io_loop_create();
+	io_loop_set_current(test_globals.ioloop);
+
+	/* Create listener */
+	test_globals.listen_fd = net_listen_unix_unlink_stale(TEST_SOCKET, 100);
+	if (test_globals.listen_fd < 0)
+		i_fatal("Cannot create unix listener: %m");
+
+	test_globals.io = io_add(test_globals.listen_fd, IO_READ,
+				 test_program_connected, &test_globals);
+	test_end();
+}
+
+static void test_program_teardown(void)
+{
+	test_begin("test_program_teardown");
+
+	if (test_globals.client != NULL)
+		test_program_client_destroy(&test_globals.client);
+
+	io_remove(&test_globals.io);
+	i_close_fd(&test_globals.listen_fd);
+	io_loop_destroy(&test_globals.ioloop);
+	i_unlink(TEST_SOCKET);
+	test_end();
+}
+
+static void test_program_async_callback(enum program_client_exit_status result,
+					int *ret)
+{
+	*ret = (int)result;
+	io_loop_stop(current_ioloop);
+}
+
+static void test_program_success(void)
+{
+	struct program_client *pc;
+	int ret;
+
+	const char *const args[] = {
+		"test_program_success", "hello", "world", NULL
+	};
+
+	test_begin("test_program_success");
+
+	pc = program_client_unix_create(TEST_SOCKET, args, &pc_set, FALSE);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	io_loop_run(current_ioloop);
+
+	test_assert(ret == 1);
+	test_assert(strcmp(str_c(output), "hello world\n") == 0);
+
+	program_client_destroy(&pc);
+
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	test_end();
+}
+
+static void test_program_io_common(const char *const *args)
+{
+	struct program_client *pc;
+	int ret;
+
+	pc = program_client_unix_create(TEST_SOCKET, args, &pc_set, FALSE);
+
+	struct istream *is = test_istream_create(pclient_test_io_string);
+	program_client_set_input(pc, is);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	io_loop_run(current_ioloop);
+
+	test_assert(ret == 1);
+	test_assert(strcmp(str_c(output), pclient_test_io_string) == 0);
+
+	program_client_destroy(&pc);
+
+	i_stream_unref(&is);
+	o_stream_unref(&os);
+	buffer_free(&output);
+}
+
+static void test_program_io(void)
+{
+	const char *args[3] = {
+		"test_program_io", NULL, NULL
+	};
+
+	test_begin("test_program_io (async)");
+
+	test_program_io_common(args);
+
+	test_end();
+
+	args[1] = "slow_disconnect";
+
+	test_begin("test_program_io (async, slow disconnect)");
+
+	test_program_io_common(args);
+
+	test_end();
+}
+
+static void test_program_failure(void)
+{
+	struct program_client *pc;
+	int ret;
+
+	const char *const args[] = {
+		"test_program_failure", NULL
+	};
+
+	test_begin("test_program_failure");
+
+	pc = program_client_unix_create(TEST_SOCKET, args, &pc_set, FALSE);
+
+	buffer_t *output = buffer_create_dynamic(default_pool, 16);
+	struct ostream *os = test_ostream_create(output);
+	program_client_set_output(pc, os);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	io_loop_run(current_ioloop);
+
+	test_assert(ret == 0);
+
+	program_client_destroy(&pc);
+
+	o_stream_unref(&os);
+	buffer_free(&output);
+
+	test_end();
+}
+
+static void test_program_noreply(void)
+{
+	struct program_client *pc;
+	int ret;
+
+	const char *const args[] = {
+		"test_program_success", "hello", "world", NULL
+	};
+
+	test_begin("test_program_noreply");
+
+	pc = program_client_unix_create(TEST_SOCKET, args, &pc_set, TRUE);
+
+	program_client_run_async(pc, test_program_async_callback, &ret);
+
+	io_loop_run(current_ioloop);
+
+	test_assert(ret == 1);
+
+	program_client_destroy(&pc);
+
+	test_end();
+}
+
+int main(int argc, char *argv[])
+{
+	int ret, c;
+
+	void (*tests[])(void) = {
+		test_program_setup,
+		test_program_success,
+		test_program_io,
+		test_program_failure,
+		test_program_noreply,
+		test_program_teardown,
+		NULL
+	};
+
+	lib_init();
+
+	while ((c = getopt(argc, argv, "D")) > 0) {
+		switch (c) {
+		case 'D':
+			pc_set.debug = TRUE;
+			break;
+		default:
+			i_fatal("Usage: %s [-D]", argv[0]);
+		}
+	}
+
+	ret = test_run(tests);
+
+	lib_deinit();
+	return ret;
+}