Imported Upstream version 4.3.1

2021-08-10 02:37:58 +02:00
parent a791de49a2
commit 2f177da8f2
2056 changed files with 421730 additions and 1668138 deletions
--- a/install/oddjob/Makefile.am
+++ b/install/oddjob/Makefile.am
@@ -4,30 +4,28 @@ oddjobdir = $(libexecdir)/ipa/oddjob
 oddjobconfdir = $(sysconfdir)/oddjobd.conf.d
 dbusconfdir = $(sysconfdir)/dbus-1/system.d

-dist_noinst_DATA =		\
-	com.redhat.idm.trust-fetch-domains.in	\
-	$(NULL)
-
-dist_oddjob_SCRIPTS =				\
+oddjob_SCRIPTS =				\
+	com.redhat.idm.trust-fetch-domains	\
 	org.freeipa.server.conncheck		\
 	$(NULL)

-nodist_oddjob_SCRIPTS =				\
-	com.redhat.idm.trust-fetch-domains	\
-	$(NULL)
-
-
-dist_dbusconf_DATA =					\
+dbusconf_DATA =						\
 	etc/dbus-1/system.d/oddjob-ipa-trust.conf	\
 	etc/dbus-1/system.d/org.freeipa.server.conf	\
 	$(NULL)

-dist_oddjobconf_DATA =					\
+oddjobconf_DATA =					\
 	etc/oddjobd.conf.d/oddjobd-ipa-trust.conf	\
 	etc/oddjobd.conf.d/ipa-server.conf		\
 	$(NULL)

-PYTHON_SHEBANG = $(nodist_oddjob_SCRIPTS)
-CLEANFILES = $(PYTHON_SHEBANG)

-include $(top_srcdir)/Makefile.pythonscripts.am
+#EXTRA_DIST =				\
+#	$(oddjob_SCRIPTS)		\
+#	$(dbusconf_DATA)		\
+#	$(oddjobconf_DATA)		\
+#	$(NULL)
+
+MAINTAINERCLEANFILES =			\
+	*~				\
+	Makefile.in
--- a/install/oddjob/Makefile.in
+++ b/install/oddjob/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -87,24 +87,13 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = install/oddjob
+subdir = oddjob
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.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/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/VERSION.m4 \
-	$(top_srcdir)/server.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../version.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(dist_oddjob_SCRIPTS) \
-	$(dist_dbusconf_DATA) $(dist_noinst_DATA) \
-	$(dist_oddjobconf_DATA) $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -136,9 +125,9 @@ am__uninstall_files_from_dir = { \
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
-am__installdirs = "$(DESTDIR)$(oddjobdir)" "$(DESTDIR)$(oddjobdir)" \
-	"$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(oddjobconfdir)"
-SCRIPTS = $(dist_oddjob_SCRIPTS) $(nodist_oddjob_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(oddjobdir)" "$(DESTDIR)$(dbusconfdir)" \
+	"$(DESTDIR)$(oddjobconfdir)"
+SCRIPTS = $(oddjob_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -158,119 +147,41 @@ am__can_run_installinfo = \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
-DATA = $(dist_dbusconf_DATA) $(dist_noinst_DATA) \
-	$(dist_oddjobconf_DATA)
+DATA = $(dbusconf_DATA) $(oddjobconf_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.pythonscripts.am
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-API_VERSION = @API_VERSION@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CMOCKA_CFLAGS = @CMOCKA_CFLAGS@
-CMOCKA_LIBS = @CMOCKA_LIBS@
-CONFIG_STATUS = @CONFIG_STATUS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CRYPTO_CFLAGS = @CRYPTO_CFLAGS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
 CYGPATH_W = @CYGPATH_W@
-DATA_VERSION = @DATA_VERSION@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRSRV_CFLAGS = @DIRSRV_CFLAGS@
-DIRSRV_LIBS = @DIRSRV_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
 GETTEXT_DOMAIN = @GETTEXT_DOMAIN@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GIT_BRANCH = @GIT_BRANCH@
-GIT_VERSION = @GIT_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-INI_CFLAGS = @INI_CFLAGS@
-INI_LIBS = @INI_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-IPAPLATFORM = @IPAPLATFORM@
 IPA_DATA_DIR = @IPA_DATA_DIR@
 IPA_SYSCONF_DIR = @IPA_SYSCONF_DIR@
-JSLINT = @JSLINT@
-KRAD_LIBS = @KRAD_LIBS@
-KRB5KDC_SERVICE = @KRB5KDC_SERVICE@
-KRB5_CFLAGS = @KRB5_CFLAGS@
-KRB5_LIBS = @KRB5_LIBS@
-LD = @LD@
-LDAP_CFLAGS = @LDAP_CFLAGS@
-LDAP_LIBS = @LDAP_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBINTL_LIBS = @LIBINTL_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBPDB_NAME = @LIBPDB_NAME@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVERTO_CFLAGS = @LIBVERTO_CFLAGS@
-LIBVERTO_LIBS = @LIBVERTO_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MK_ASSIGN = @MK_ASSIGN@
-MK_ELSE = @MK_ELSE@
-MK_ENDIF = @MK_ENDIF@
-MK_IFEQ = @MK_IFEQ@
 MSGATTRIB = @MSGATTRIB@
+MSGCMP = @MSGCMP@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
+MSGINIT = @MSGINIT@
 MSGMERGE = @MSGMERGE@
-NAMED_GROUP = @NAMED_GROUP@
-NDRNBT_CFLAGS = @NDRNBT_CFLAGS@
-NDRNBT_LIBS = @NDRNBT_LIBS@
-NDRPAC_CFLAGS = @NDRPAC_CFLAGS@
-NDRPAC_LIBS = @NDRPAC_LIBS@
-NDR_CFLAGS = @NDR_CFLAGS@
-NDR_LIBS = @NDR_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NSPR_CFLAGS = @NSPR_CFLAGS@
-NSPR_LIBS = @NSPR_LIBS@
-NSS_CFLAGS = @NSS_CFLAGS@
-NSS_LIBS = @NSS_LIBS@
-NUM_VERSION = @NUM_VERSION@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ODS_USER = @ODS_USER@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -279,89 +190,33 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLATFORM_PYTHON = @PLATFORM_PYTHON@
-POPT_CFLAGS = @POPT_CFLAGS@
-POPT_LIBS = @POPT_LIBS@
-POSUB = @POSUB@
-PYLINT = @PYLINT@
-PYTHON = @PYTHON@
-PYTHON2 = @PYTHON2@
-PYTHON3 = @PYTHON3@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INSTALL_EXTRA_OPTIONS = @PYTHON_INSTALL_EXTRA_OPTIONS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SAMBA40EXTRA_LIBPATH = @SAMBA40EXTRA_LIBPATH@
-SAMBAUTIL_CFLAGS = @SAMBAUTIL_CFLAGS@
-SAMBAUTIL_LIBS = @SAMBAUTIL_LIBS@
-SASL_CFLAGS = @SASL_CFLAGS@
-SASL_LIBS = @SASL_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SSSCERTMAP_CFLAGS = @SSSCERTMAP_CFLAGS@
-SSSCERTMAP_LIBS = @SSSCERTMAP_LIBS@
-SSSIDMAP_CFLAGS = @SSSIDMAP_CFLAGS@
-SSSIDMAP_LIBS = @SSSIDMAP_LIBS@
-SSSNSSIDMAP_CFLAGS = @SSSNSSIDMAP_CFLAGS@
-SSSNSSIDMAP_LIBS = @SSSNSSIDMAP_LIBS@
 STRIP = @STRIP@
-TALLOC_CFLAGS = @TALLOC_CFLAGS@
-TALLOC_LIBS = @TALLOC_LIBS@
-TEVENT_CFLAGS = @TEVENT_CFLAGS@
-TEVENT_LIBS = @TEVENT_LIBS@
-UNISTRING_LIBS = @UNISTRING_LIBS@
-UNLINK = @UNLINK@
-USE_NLS = @USE_NLS@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VENDOR_SUFFIX = @VENDOR_SUFFIX@
+TX = @TX@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLRPC_CFLAGS = @XMLRPC_CFLAGS@
-XMLRPC_LIBS = @XMLRPC_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_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@
 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@
-i18ntests = @i18ntests@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-krb5rundir = @krb5rundir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -370,20 +225,13 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-sysconfenvdir = @sysconfenvdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-systemdtmpfilesdir = @systemdtmpfilesdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -392,34 +240,35 @@ NULL =
 oddjobdir = $(libexecdir)/ipa/oddjob
 oddjobconfdir = $(sysconfdir)/oddjobd.conf.d
 dbusconfdir = $(sysconfdir)/dbus-1/system.d
-dist_noinst_DATA = \
-	com.redhat.idm.trust-fetch-domains.in	\
-	$(NULL)
-
-dist_oddjob_SCRIPTS = \
+oddjob_SCRIPTS = \
+	com.redhat.idm.trust-fetch-domains	\
 	org.freeipa.server.conncheck		\
 	$(NULL)

-nodist_oddjob_SCRIPTS = \
-	com.redhat.idm.trust-fetch-domains	\
-	$(NULL)
-
-dist_dbusconf_DATA = \
+dbusconf_DATA = \
 	etc/dbus-1/system.d/oddjob-ipa-trust.conf	\
 	etc/dbus-1/system.d/org.freeipa.server.conf	\
 	$(NULL)

-dist_oddjobconf_DATA = \
+oddjobconf_DATA = \
 	etc/oddjobd.conf.d/oddjobd-ipa-trust.conf	\
 	etc/oddjobd.conf.d/ipa-server.conf		\
 	$(NULL)

-PYTHON_SHEBANG = $(nodist_oddjob_SCRIPTS)
-CLEANFILES = $(PYTHON_SHEBANG)
+
+#EXTRA_DIST =				\
+#	$(oddjob_SCRIPTS)		\
+#	$(dbusconf_DATA)		\
+#	$(oddjobconf_DATA)		\
+#	$(NULL)
+MAINTAINERCLEANFILES = \
+	*~				\
+	Makefile.in
+
 all: all-am

 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.pythonscripts.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -428,30 +277,29 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.pythonscrip
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign install/oddjob/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign oddjob/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign install/oddjob/Makefile
+	  $(AUTOMAKE) --foreign oddjob/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);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/Makefile.pythonscripts.am $(am__empty):

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-dist_oddjobSCRIPTS: $(dist_oddjob_SCRIPTS)
+install-oddjobSCRIPTS: $(oddjob_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_oddjob_SCRIPTS)'; test -n "$(oddjobdir)" || list=; \
+	@list='$(oddjob_SCRIPTS)'; test -n "$(oddjobdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(oddjobdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(oddjobdir)" || exit 1; \
@@ -478,56 +326,15 @@ install-dist_oddjobSCRIPTS: $(dist_oddjob_SCRIPTS)
 	     } \
 	; done

-uninstall-dist_oddjobSCRIPTS:
+uninstall-oddjobSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_oddjob_SCRIPTS)'; test -n "$(oddjobdir)" || exit 0; \
+	@list='$(oddjob_SCRIPTS)'; test -n "$(oddjobdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(oddjobdir)'; $(am__uninstall_files_from_dir)
-install-nodist_oddjobSCRIPTS: $(nodist_oddjob_SCRIPTS)
+install-dbusconfDATA: $(dbusconf_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(nodist_oddjob_SCRIPTS)'; test -n "$(oddjobdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(oddjobdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(oddjobdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(oddjobdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(oddjobdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-nodist_oddjobSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_oddjob_SCRIPTS)'; test -n "$(oddjobdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(oddjobdir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-dist_dbusconfDATA: $(dist_dbusconf_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
+	@list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(dbusconfdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)" || exit 1; \
@@ -541,14 +348,14 @@ install-dist_dbusconfDATA: $(dist_dbusconf_DATA)
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusconfdir)" || exit $$?; \
 	done

-uninstall-dist_dbusconfDATA:
+uninstall-dbusconfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
+	@list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(dbusconfdir)'; $(am__uninstall_files_from_dir)
-install-dist_oddjobconfDATA: $(dist_oddjobconf_DATA)
+install-oddjobconfDATA: $(oddjobconf_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_oddjobconf_DATA)'; test -n "$(oddjobconfdir)" || list=; \
+	@list='$(oddjobconf_DATA)'; test -n "$(oddjobconfdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(oddjobconfdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(oddjobconfdir)" || exit 1; \
@@ -562,9 +369,9 @@ install-dist_oddjobconfDATA: $(dist_oddjobconf_DATA)
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(oddjobconfdir)" || exit $$?; \
 	done

-uninstall-dist_oddjobconfDATA:
+uninstall-oddjobconfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_oddjobconf_DATA)'; test -n "$(oddjobconfdir)" || list=; \
+	@list='$(oddjobconf_DATA)'; test -n "$(oddjobconfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(oddjobconfdir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
@@ -574,10 +381,7 @@ ctags CTAGS:
 cscope cscopelist:


-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -611,7 +415,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(oddjobdir)" "$(DESTDIR)$(oddjobdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(oddjobconfdir)"; do \
+	for dir in "$(DESTDIR)$(oddjobdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(oddjobconfdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -636,7 +440,6 @@ install-strip:
 mostlyclean-generic:

 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -645,9 +448,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am

-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am
 	-rm -f Makefile
@@ -665,8 +469,8 @@ info: info-am

 info-am:

-install-data-am: install-dist_dbusconfDATA install-dist_oddjobSCRIPTS \
-	install-dist_oddjobconfDATA install-nodist_oddjobSCRIPTS
+install-data-am: install-dbusconfDATA install-oddjobSCRIPTS \
+	install-oddjobconfDATA

 install-dvi: install-dvi-am

@@ -700,7 +504,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-am

-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic

 pdf: pdf-am

@@ -710,36 +514,28 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-dist_dbusconfDATA uninstall-dist_oddjobSCRIPTS \
-	uninstall-dist_oddjobconfDATA uninstall-nodist_oddjobSCRIPTS
+uninstall-am: uninstall-dbusconfDATA uninstall-oddjobSCRIPTS \
+	uninstall-oddjobconfDATA

 .MAKE: install-am install-strip

-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_dbusconfDATA install-dist_oddjobSCRIPTS \
-	install-dist_oddjobconfDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man \
-	install-nodist_oddjobSCRIPTS install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-dist_dbusconfDATA \
-	uninstall-dist_oddjobSCRIPTS uninstall-dist_oddjobconfDATA \
-	uninstall-nodist_oddjobSCRIPTS
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dbusconfDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-oddjobSCRIPTS install-oddjobconfDATA install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-dbusconfDATA uninstall-oddjobSCRIPTS \
+	uninstall-oddjobconfDATA

 .PRECIOUS: Makefile


-# special handling of Python scripts with auto-generated shebang line
-$(PYTHON_SHEBANG):%: %.in Makefile
-	$(AM_V_GEN)sed -e 's|@PYTHONSHEBANG[@]|#!$(PYTHON) -E|g' $< > $@
-	$(AM_V_GEN)chmod +x $@
-
 # 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:
--- a/install/oddjob/com.redhat.idm.trust-fetch-domains.in
+++ b/install/oddjob/com.redhat.idm.trust-fetch-domains.in
@@ -1,21 +1,20 @@
-@PYTHONSHEBANG@
+#!/usr/bin/python2

 from ipaserver import dcerpc
 from ipaserver.install.installutils import is_ipa_configured, ScriptError
 from ipapython import config, ipautil
-from ipalib import api
+from ipalib import api, errors
 from ipapython.dn import DN
+from ipalib.config import Env
+from ipalib.constants import DEFAULT_CONFIG
+from ipapython.ipautil import kinit_keytab
 from ipaplatform.constants import constants
-from ipaplatform.paths import paths
 import sys
-import os
-import pwd
+import os, pwd

 import six
 import gssapi

-from ipalib.install.kinit import kinit_keytab
-
 if six.PY3:
    unicode = str

@@ -34,30 +33,12 @@ def retrieve_keytab(api, ccache_name, oneway_keytab_name, oneway_principal):
    try:
        sssd = pwd.getpwnam(constants.SSSD_USER)
        os.chown(oneway_keytab_name, sssd[2], sssd[3])
-    except KeyError:
+    except KeyError as e:
        # If user 'sssd' does not exist, we don't need to chown from root to sssd
        # because it means SSSD does not run as sssd user
        pass


-def get_forest_root_domain(api_instance, trusted_domain):
-    """
-    retrieve trusted forest root domain for given domain name
-
-    :param api_instance: IPA API instance
-    :param trusted_domain: trusted domain name
-
-    :returns: forest root domain DNS name
-    """
-    trustconfig_show = api_instance.Command.trustconfig_show
-    flatname = trustconfig_show()['result']['ipantflatname'][0]
-
-    remote_domain = dcerpc.retrieve_remote_domain(
-        api_instance.env.host, flatname, trusted_domain)
-
-    return remote_domain.info['dns_forest']
-
-
 def parse_options():
    usage = "%prog <trusted domain name>\n"
    parser = config.IPAOptionParser(usage=usage,
@@ -89,13 +70,17 @@ if len(args) != 1:

 trusted_domain = ipautil.fsdecode(args[0]).lower()

-api.bootstrap(in_server=True, log=None,
-              context='server', confdir=paths.ETC_IPA)
+env = Env()
+env._bootstrap(context='server', debug=options.debug, log=None)
+env._finalize_core(**dict(DEFAULT_CONFIG))
+
+# Initialize the API with the proper debug level
+api.bootstrap(context='server', debug=env.debug, log=None)
 api.finalize()

 # Only import trust plugin after api is initialized or internal imports
 # within the plugin will not work
-from ipaserver.plugins import trust
+from ipalib.plugins import trust

 # We have to dance with two different credentials caches:
 # ccache_name         --  for cifs/ipa.master@IPA.REALM to communicate with LDAP
@@ -183,14 +168,34 @@ except gssapi.exceptions.GSSError:
 # We are done: we have ccache with TDO credentials and can fetch domains
 ipa_domain = api.env.domain
 os.environ['KRB5CCNAME'] = oneway_ccache_name
+domains = dcerpc.fetch_domains(api, ipa_domain, trusted_domain, creds=True)

-# retrieve the forest root domain name and contact it to retrieve trust
-# topology info
-forest_root = get_forest_root_domain(api, trusted_domain)
+if domains:
+    # trust range must exist by the time fetch_domains_from_trust is called
+    range_name = unicode(trusted_domain.upper() + '_id_range')
+    old_range = api.Command.idrange_show(range_name, raw=True)['result']
+    idrange_type = old_range['iparangetype'][0]

-domains = dcerpc.fetch_domains(api, ipa_domain, forest_root, creds=True)
-trust_domain_object = api.Command.trust_show(trusted_domain, raw=True)['result']
-trust.add_new_domains_from_trust(api, None, trust_domain_object, domains)
+    result = []
+    for dom in domains:
+        dom['trust_type'] = u'ad'
+        try:
+            name = dom['cn']
+            del dom['cn']
+
+            res = api.Command.trustdomain_add(trusted_domain, name, **dom)
+            result.append(res['result'])
+
+            if idrange_type != u'ipa-ad-trust-posix':
+                range_name = name.upper() + '_id_range'
+                dom['range_type'] = u'ipa-ad-trust'
+                # Do not pass ipaserver.dcerpc.TrustInstance to trust.add_range
+                # to force it using existing credentials cache
+                trust.add_range(api, None, range_name, dom['ipanttrusteddomainsid'],
+                                trusted_domain, name, **dom)
+        except errors.DuplicateEntry:
+            # Ignore updating duplicate entries
+            pass

 if old_ccache:
   os.environ['KRB5CCNAME'] = old_ccache
--- a/install/oddjob/etc/dbus-1/system.d/oddjob-ipa-trust.conf
+++ b/install/oddjob/etc/dbus-1/system.d/oddjob-ipa-trust.conf
@@ -30,7 +30,7 @@
           send_member="Get"/>
  </policy>

-  <policy user="ipaapi">
+  <policy user="apache">
    <allow send_destination="com.redhat.idm.trust"
           send_path="/"
           send_interface="com.redhat.idm.trust"
--- a/install/oddjob/etc/dbus-1/system.d/org.freeipa.server.conf
+++ b/install/oddjob/etc/dbus-1/system.d/org.freeipa.server.conf
@@ -10,7 +10,7 @@
    <allow send_destination="org.freeipa.server" send_interface="org.freeipa.server"/>
  </policy>

-  <policy user="ipaapi">
+  <policy user="apache">
    <allow send_destination="org.freeipa.server" send_interface="org.freeipa.server"/>
  </policy>

--- a/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf
+++ b/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf
@@ -2,7 +2,7 @@
 <oddjobconfig>
  <service name="org.freeipa.server">
    <allow user="root"/>
-    <allow user="ipaapi"/>
+    <allow user="apache"/>
    <object name="/">
      <interface name="org.freeipa.server">
        <method name="conncheck">
--- a/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
+++ b/install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
@@ -2,7 +2,7 @@
 <oddjobconfig>
  <service name="com.redhat.idm.trust">
    <allow user="root"/>
-    <allow user="ipaapi"/>
+    <allow user="apache"/>
    <object name="/">
      <interface name="org.freedesktop.DBus.Introspectable">
        <allow min_uid="0" max_uid="0"/>
--- a/install/oddjob/org.freeipa.server.conncheck
+++ b/install/oddjob/org.freeipa.server.conncheck
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/sbin/ipa-replica-conncheck --no-log --replica "$1" 2>&1
+exec /usr/sbin/ipa-replica-conncheck --replica "$1" 2>&1