Imported Upstream version 4.0.5

2021-07-25 07:50:50 +02:00
parent 8ff3be4216
commit 3bfaa6e020
2049 changed files with 317193 additions and 1632423 deletions
--- a/daemons/ipa-otpd/Makefile.am
+++ b/daemons/ipa-otpd/Makefile.am
@@ -1,9 +1,8 @@
-AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ @KRB5_CFLAGS@
-AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ @KRB5_LIBS@
+AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@
+AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@

 noinst_HEADERS = internal.h
-appdir = $(libexecdir)/ipa/
-app_PROGRAMS = ipa-otpd
+libexec_PROGRAMS = ipa-otpd
 dist_noinst_DATA = ipa-otpd.socket.in ipa-otpd@.service.in test.py
 systemdsystemunit_DATA = ipa-otpd.socket ipa-otpd@.service

@@ -11,7 +10,6 @@ ipa_otpd_SOURCES = bind.c forward.c main.c parse.c query.c queue.c stdio.c

 %.socket: %.socket.in
 	@sed -e 's|@krb5rundir[@]|$(krb5rundir)|g' \
-	     -e 's|@KRB5KDC_SERVICE[@]|$(KRB5KDC_SERVICE)|g' \
 	     -e 's|@UNLINK[@]|@UNLINK@|g' \
 	     $< > $@

--- a/daemons/ipa-otpd/Makefile.in
+++ b/daemons/ipa-otpd/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,17 +17,7 @@


 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__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@@ -90,29 +80,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-app_PROGRAMS = ipa-otpd$(EXEEXT)
-subdir = daemons/ipa-otpd
+libexec_PROGRAMS = ipa-otpd$(EXEEXT)
+subdir = ipa-otpd
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(dist_noinst_DATA) $(noinst_HEADERS)
 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_noinst_DATA) \
-	$(noinst_HEADERS) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(appdir)" \
+am__installdirs = "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(systemdsystemunitdir)"
-PROGRAMS = $(app_PROGRAMS)
+PROGRAMS = $(libexec_PROGRAMS)
 am_ipa_otpd_OBJECTS = bind.$(OBJEXT) forward.$(OBJEXT) main.$(OBJEXT) \
 	parse.$(OBJEXT) query.$(OBJEXT) queue.$(OBJEXT) \
 	stdio.$(OBJEXT)
@@ -211,12 +194,10 @@ am__define_uniq_tagged_files = \
  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@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-API_VERSION = @API_VERSION@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -225,15 +206,13 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHECK_CFLAGS = @CHECK_CFLAGS@
+CHECK_LIBS = @CHECK_LIBS@
 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@
@@ -247,61 +226,31 @@ 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@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NAMED_GROUP = @NAMED_GROUP@
 NDRNBT_CFLAGS = @NDRNBT_CFLAGS@
 NDRNBT_LIBS = @NDRNBT_LIBS@
 NDRPAC_CFLAGS = @NDRPAC_CFLAGS@
@@ -314,10 +263,10 @@ 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@
+OPENLDAP_CFLAGS = @OPENLDAP_CFLAGS@
+OPENLDAP_LIBS = @OPENLDAP_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -331,15 +280,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-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@
@@ -347,13 +289,10 @@ 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@
+SSL_LIBS = @SSL_LIBS@
 SSSIDMAP_CFLAGS = @SSSIDMAP_CFLAGS@
 SSSIDMAP_LIBS = @SSSIDMAP_LIBS@
 SSSNSSIDMAP_CFLAGS = @SSSNSSIDMAP_CFLAGS@
@@ -365,16 +304,8 @@ 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@
 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@
@@ -405,7 +336,6 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-i18ntests = @i18ntests@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -429,17 +359,14 @@ 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@
 top_srcdir = @top_srcdir@
-AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ @KRB5_CFLAGS@
-AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ @KRB5_LIBS@
+AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@
+AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@
 noinst_HEADERS = internal.h
-appdir = $(libexecdir)/ipa/
 dist_noinst_DATA = ipa-otpd.socket.in ipa-otpd@.service.in test.py
 systemdsystemunit_DATA = ipa-otpd.socket ipa-otpd@.service
 ipa_otpd_SOURCES = bind.c forward.c main.c parse.c query.c queue.c stdio.c
@@ -448,7 +375,7 @@ all: all-am

 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.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*) \
@@ -457,9 +384,10 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign daemons/ipa-otpd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ipa-otpd/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign daemons/ipa-otpd/Makefile
+	  $(AUTOMAKE) --foreign ipa-otpd/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -472,17 +400,17 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(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-appPROGRAMS: $(app_PROGRAMS)
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	@list='$(app_PROGRAMS)'; test -n "$(appdir)" || list=; \
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(appdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(appdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
@@ -502,24 +430,24 @@ install-appPROGRAMS: $(app_PROGRAMS)
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(appdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(appdir)$$dir" || exit $$?; \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
 	    } \
 	; done

-uninstall-appPROGRAMS:
+uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(app_PROGRAMS)'; test -n "$(appdir)" || list=; \
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
 	`; \
 	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(appdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files

-clean-appPROGRAMS:
-	@list='$(app_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-libexecPROGRAMS:
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
@@ -679,7 +607,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(appdir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \
+	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -715,7 +643,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-clean-am: clean-appPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
+	mostlyclean-am

 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -735,13 +664,13 @@ info: info-am

 info-am:

-install-data-am: install-appPROGRAMS install-systemdsystemunitDATA
+install-data-am: install-systemdsystemunitDATA

 install-dvi: install-dvi-am

 install-dvi-am:

-install-exec-am:
+install-exec-am: install-libexecPROGRAMS

 install-html: install-html-am

@@ -781,32 +710,30 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-appPROGRAMS uninstall-systemdsystemunitDATA
+uninstall-am: uninstall-libexecPROGRAMS \
+	uninstall-systemdsystemunitDATA

 .MAKE: install-am install-strip

-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-appPROGRAMS clean-generic clean-libtool cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libexecPROGRAMS clean-libtool 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-appPROGRAMS \
-	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-ps install-ps-am install-strip \
-	install-systemdsystemunitDATA 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-appPROGRAMS \
+	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-libexecPROGRAMS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-systemdsystemunitDATA 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-libexecPROGRAMS \
 	uninstall-systemdsystemunitDATA

-.PRECIOUS: Makefile
-

 %.socket: %.socket.in
 	@sed -e 's|@krb5rundir[@]|$(krb5rundir)|g' \
-	     -e 's|@KRB5KDC_SERVICE[@]|$(KRB5KDC_SERVICE)|g' \
 	     -e 's|@UNLINK[@]|@UNLINK@|g' \
 	     $< > $@

--- a/daemons/ipa-otpd/bind.c
+++ b/daemons/ipa-otpd/bind.c
@@ -26,12 +26,9 @@
 */

 #include "internal.h"
-#include "../ipa-slapi-plugins/ipa-pwd-extop/otpctrl.h"

 static void on_bind_writable(verto_ctx *vctx, verto_ev *ev)
 {
-    LDAPControl control = { OTP_REQUIRED_OID, {}, true };
-    LDAPControl *ctrls[] = { &control, NULL };
    struct otpd_queue *push = &ctx.stdio.responses;
    const krb5_data *data;
    struct berval cred;
@@ -58,7 +55,7 @@ static void on_bind_writable(verto_ctx *vctx, verto_ev *ev)
    cred.bv_val = data->data;
    cred.bv_len = data->length;
    i = ldap_sasl_bind(verto_get_private(ev), item->user.dn, LDAP_SASL_SIMPLE,
-                       &cred, ctrls, NULL, &item->msgid);
+                       &cred, NULL, NULL, &item->msgid);
    if (i != LDAP_SUCCESS) {
        otpd_log_err(errno, "Unable to initiate bind: %s", ldap_err2string(i));
        verto_break(ctx.vctx);
@@ -85,9 +82,6 @@ static void on_bind_readable(verto_ctx *vctx, verto_ev *ev)
        if (rslt <= 0)
            results = NULL;
        ldap_msgfree(results);
-        otpd_log_err(EIO, "IO error received on bind socket");
-        verto_break(ctx.vctx);
-        ctx.exitstatus = 1;
        return;
    }

@@ -140,6 +134,11 @@ void otpd_on_bind_io(verto_ctx *vctx, verto_ev *ev)
    flags = verto_get_fd_state(ev);
    if (flags & VERTO_EV_FLAG_IO_WRITE)
        on_bind_writable(vctx, ev);
-    if (flags & (VERTO_EV_FLAG_IO_READ | VERTO_EV_FLAG_IO_ERROR))
+    if (flags & VERTO_EV_FLAG_IO_READ)
        on_bind_readable(vctx, ev);
+    if (flags & VERTO_EV_FLAG_IO_ERROR) {
+        otpd_log_err(EIO, "IO error received on bind socket");
+        verto_break(ctx.vctx);
+        ctx.exitstatus = 1;
+    }
 }
--- a/daemons/ipa-otpd/internal.h
+++ b/daemons/ipa-otpd/internal.h
@@ -20,7 +20,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#pragma once
+#ifndef INTERNAL_H_
+#define INTERNAL_H_

 #include "krad.h"

@@ -148,3 +149,5 @@ const char *otpd_parse_radius(LDAP *ldp, LDAPMessage *entry,

 const char *otpd_parse_radius_username(LDAP *ldp, LDAPMessage *entry,
                                       struct otpd_queue_item *item);
+
+#endif /* INTERNAL_H_ */
--- a/daemons/ipa-otpd/ipa-otpd.socket.in
+++ b/daemons/ipa-otpd/ipa-otpd.socket.in
@@ -3,9 +3,9 @@ Description=ipa-otpd socket

 [Socket]
 ListenStream=@krb5rundir@/DEFAULT.socket
-RemoveOnStop=true
+ExecStopPre=@UNLINK@ @krb5rundir@/DEFAULT.socket
 SocketMode=0600
 Accept=true

 [Install]
-WantedBy=@KRB5KDC_SERVICE@
+WantedBy=krb5kdc.service
--- a/daemons/ipa-otpd/ipa-otpd@.service.in
+++ b/daemons/ipa-otpd/ipa-otpd@.service.in
@@ -3,7 +3,7 @@ Description=ipa-otpd service

 [Service]
 EnvironmentFile=@sysconfdir@/ipa/default.conf
-ExecStart=@libexecdir@/ipa/ipa-otpd $ldap_uri
+ExecStart=@libexecdir@/ipa-otpd $ldap_uri
 StandardInput=socket
 StandardOutput=socket
 StandardError=syslog
--- a/daemons/ipa-otpd/main.c
+++ b/daemons/ipa-otpd/main.c
@@ -175,13 +175,12 @@ static krb5_error_code setup_ldap(const char *uri, krb5_boolean bind,

    /* Always find the base since this forces open the socket. */
    basetmp = find_base(ldp);
-    if (base != NULL) {
-        if (basetmp == NULL)
-            return ENOTCONN;
+    if (basetmp == NULL)
+        return ENOTCONN;
+    if (base != NULL)
        *base = basetmp;
-    } else {
+    else
        free(basetmp);
-    }

    /* Set default timeout to just return immediately for async requests. */
    memset(&timeout, 0, sizeof(timeout));
--- a/daemons/ipa-otpd/query.c
+++ b/daemons/ipa-otpd/query.c
@@ -133,11 +133,7 @@ static void on_query_readable(verto_ctx *vctx, verto_ev *ev)
    if (i != LDAP_RES_SEARCH_ENTRY && i != LDAP_RES_SEARCH_RESULT) {
        if (i <= 0)
            results = NULL;
-        ldap_msgfree(results);
-        otpd_log_err(EIO, "IO error received on query socket");
-        verto_break(ctx.vctx);
-        ctx.exitstatus = 1;
-        return;
+        goto egress;
    }

    item = otpd_queue_pop_msgid(&ctx.query.responses, ldap_msgid(results));
@@ -247,6 +243,11 @@ void otpd_on_query_io(verto_ctx *vctx, verto_ev *ev)
    flags = verto_get_fd_state(ev);
    if (flags & VERTO_EV_FLAG_IO_WRITE)
        on_query_writable(vctx, ev);
-    if (flags & (VERTO_EV_FLAG_IO_READ | VERTO_EV_FLAG_IO_ERROR))
+    if (flags & VERTO_EV_FLAG_IO_READ)
        on_query_readable(vctx, ev);
+    if (flags & VERTO_EV_FLAG_IO_ERROR) {
+        otpd_log_err(EIO, "IO error received on query socket");
+        verto_break(ctx.vctx);
+        ctx.exitstatus = 1;
+    }
 }
--- a/daemons/ipa-otpd/test.py
+++ b/daemons/ipa-otpd/test.py
@@ -20,12 +20,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

+import StringIO
 import struct
 import subprocess
 import sys

-from six import StringIO
-
 try:
    from pyrad import packet
    from pyrad.dictionary import Dictionary
@@ -41,28 +40,22 @@ ATTRIBUTE	User-Password	2	string
 ATTRIBUTE	NAS-Identifier	32	string
 """

+dct = Dictionary(StringIO.StringIO(DICTIONARY))

-def main():
-    dct = Dictionary(StringIO(DICTIONARY))
+proc = subprocess.Popen(["./ipa-otpd", sys.argv[1]],
+                        stdin=subprocess.PIPE, stdout=subprocess.PIPE)

-    proc = subprocess.Popen(["./ipa-otpd", sys.argv[1]],
-                            stdin=subprocess.PIPE,
-                            stdout=subprocess.PIPE)
+pkt = packet.AuthPacket(secret="", dict=dct)
+pkt["User-Name"] = sys.argv[2]
+pkt["User-Password"] = pkt.PwCrypt(sys.argv[3])
+pkt["NAS-Identifier"] = "localhost"
+proc.stdin.write(pkt.RequestPacket())

-    pkt = packet.AuthPacket(secret="", dict=dct)
-    pkt["User-Name"] = sys.argv[2]
-    pkt["User-Password"] = pkt.PwCrypt(sys.argv[3])
-    pkt["NAS-Identifier"] = "localhost"
-    proc.stdin.write(pkt.RequestPacket())
+rsp = packet.Packet(secret="", dict=dict)
+buf = proc.stdout.read(4)
+buf += proc.stdout.read(struct.unpack("!BBH", buf)[2] - 4)
+rsp.DecodePacket(buf)
+pkt.VerifyReply(rsp)

-    rsp = packet.Packet(secret="", dict=dict)
-    buf = proc.stdout.read(4)
-    buf += proc.stdout.read(struct.unpack("!BBH", buf)[2] - 4)
-    rsp.DecodePacket(buf)
-    pkt.VerifyReply(rsp)
-
-    proc.terminate()  # pylint: disable=E1101
-    proc.wait()
-
-if __name__ == '__main__':
-    main()
+proc.terminate() #pylint: disable=E1101
+proc.wait()