Imported Debian patch 4.7.2-3
This commit is contained in:
Timo Aaltonen
committed by
Mario Fetka
Mario Fetka
parent
27edeba051
commit
8bc559c5a1
@@ -3,15 +3,4 @@ NULL =
|
||||
appdir = $(IPA_DATA_DIR)/client
|
||||
dist_app_DATA = \
|
||||
freeipa.template \
|
||||
sshd_ipa.conf.template \
|
||||
$(NULL)
|
||||
|
||||
epnconfdir = $(IPA_SYSCONF_DIR)
|
||||
dist_epnconf_DATA = \
|
||||
epn.conf \
|
||||
$(NULL)
|
||||
|
||||
epntemplatedir = $(IPA_SYSCONF_DIR)/epn
|
||||
dist_epntemplate_DATA = \
|
||||
expire_msg.template \
|
||||
$(NULL)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.16.2 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -102,7 +102,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(dist_app_DATA) \
|
||||
$(dist_epnconf_DATA) $(dist_epntemplate_DATA) \
|
||||
$(am__DIST_COMMON)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
@@ -154,9 +153,8 @@ am__uninstall_files_from_dir = { \
|
||||
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||||
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||||
}
|
||||
am__installdirs = "$(DESTDIR)$(appdir)" "$(DESTDIR)$(epnconfdir)" \
|
||||
"$(DESTDIR)$(epntemplatedir)"
|
||||
DATA = $(dist_app_DATA) $(dist_epnconf_DATA) $(dist_epntemplate_DATA)
|
||||
am__installdirs = "$(DESTDIR)$(appdir)"
|
||||
DATA = $(dist_app_DATA)
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
am__DIST_COMMON = $(srcdir)/Makefile.in
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -217,8 +215,6 @@ JSLINT = @JSLINT@
|
||||
KRAD_LIBS = @KRAD_LIBS@
|
||||
KRB5KDC_SERVICE = @KRB5KDC_SERVICE@
|
||||
KRB5_CFLAGS = @KRB5_CFLAGS@
|
||||
KRB5_GSSAPI_CFLAGS = @KRB5_GSSAPI_CFLAGS@
|
||||
KRB5_GSSAPI_LIBS = @KRB5_GSSAPI_LIBS@
|
||||
KRB5_LIBS = @KRB5_LIBS@
|
||||
LD = @LD@
|
||||
LDAP_CFLAGS = @LDAP_CFLAGS@
|
||||
@@ -261,10 +257,11 @@ 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_GROUP = @ODS_GROUP@
|
||||
ODS_USER = @ODS_USER@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
@@ -285,6 +282,8 @@ 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@
|
||||
@@ -372,9 +371,7 @@ program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
pyexecdir = @pyexecdir@
|
||||
pythondir = @pythondir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
selinux_makefile = @selinux_makefile@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@@ -389,17 +386,6 @@ NULL =
|
||||
appdir = $(IPA_DATA_DIR)/client
|
||||
dist_app_DATA = \
|
||||
freeipa.template \
|
||||
sshd_ipa.conf.template \
|
||||
$(NULL)
|
||||
|
||||
epnconfdir = $(IPA_SYSCONF_DIR)
|
||||
dist_epnconf_DATA = \
|
||||
epn.conf \
|
||||
$(NULL)
|
||||
|
||||
epntemplatedir = $(IPA_SYSCONF_DIR)/epn
|
||||
dist_epntemplate_DATA = \
|
||||
expire_msg.template \
|
||||
$(NULL)
|
||||
|
||||
all: all-am
|
||||
@@ -461,48 +447,6 @@ uninstall-dist_appDATA:
|
||||
@list='$(dist_app_DATA)'; test -n "$(appdir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
dir='$(DESTDIR)$(appdir)'; $(am__uninstall_files_from_dir)
|
||||
install-dist_epnconfDATA: $(dist_epnconf_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(dist_epnconf_DATA)'; test -n "$(epnconfdir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(epnconfdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(epnconfdir)" || 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_DATA) $$files '$(DESTDIR)$(epnconfdir)'"; \
|
||||
$(INSTALL_DATA) $$files "$(DESTDIR)$(epnconfdir)" || exit $$?; \
|
||||
done
|
||||
|
||||
uninstall-dist_epnconfDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(dist_epnconf_DATA)'; test -n "$(epnconfdir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
dir='$(DESTDIR)$(epnconfdir)'; $(am__uninstall_files_from_dir)
|
||||
install-dist_epntemplateDATA: $(dist_epntemplate_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(dist_epntemplate_DATA)'; test -n "$(epntemplatedir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(epntemplatedir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(epntemplatedir)" || 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_DATA) $$files '$(DESTDIR)$(epntemplatedir)'"; \
|
||||
$(INSTALL_DATA) $$files "$(DESTDIR)$(epntemplatedir)" || exit $$?; \
|
||||
done
|
||||
|
||||
uninstall-dist_epntemplateDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(dist_epntemplate_DATA)'; test -n "$(epntemplatedir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
dir='$(DESTDIR)$(epntemplatedir)'; $(am__uninstall_files_from_dir)
|
||||
tags TAGS:
|
||||
|
||||
ctags CTAGS:
|
||||
@@ -547,7 +491,7 @@ check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(appdir)" "$(DESTDIR)$(epnconfdir)" "$(DESTDIR)$(epntemplatedir)"; do \
|
||||
for dir in "$(DESTDIR)$(appdir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@@ -600,8 +544,7 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-dist_appDATA install-dist_epnconfDATA \
|
||||
install-dist_epntemplateDATA
|
||||
install-data-am: install-dist_appDATA
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
@@ -645,8 +588,7 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-dist_appDATA uninstall-dist_epnconfDATA \
|
||||
uninstall-dist_epntemplateDATA
|
||||
uninstall-am: uninstall-dist_appDATA
|
||||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
@@ -654,16 +596,14 @@ uninstall-am: uninstall-dist_appDATA uninstall-dist_epnconfDATA \
|
||||
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_appDATA install-dist_epnconfDATA \
|
||||
install-dist_epntemplateDATA 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 \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
install-dist_appDATA 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 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_appDATA uninstall-dist_epnconfDATA \
|
||||
uninstall-dist_epntemplateDATA
|
||||
uninstall-am uninstall-dist_appDATA
|
||||
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
# Global IPA-EPN [0] configuration file.
|
||||
# For a complete explanation of each parameter, see the epn.conf(5)
|
||||
# manual page.
|
||||
# For best results, change no more than a single parameter at a time,
|
||||
# and test if ipa-epn(1) still works as intended, using --dry-run when
|
||||
# it makes sense.
|
||||
#
|
||||
# [0] https://github.com/freeipa/freeipa/blob/master/doc/designs/expiring-password-notification.md
|
||||
|
||||
[global]
|
||||
|
||||
# Specifies the SMTP server to use.
|
||||
smtp_server = localhost
|
||||
|
||||
# Specifies the SMTP port.
|
||||
smtp_port = 25
|
||||
|
||||
# Specifies the id of the user to authenticate with the SMTP server.
|
||||
# Default None (empty value).
|
||||
# smtp_user =
|
||||
|
||||
# Specifies the password for the authorized user.
|
||||
# Default None (empty value).
|
||||
# smtp_password =
|
||||
|
||||
# Specifies the number of seconds to wait for SMTP to respond.
|
||||
smtp_timeout = 60
|
||||
|
||||
# Specifies the type of secure connection to make. Options are: none,
|
||||
# starttls and ssl.
|
||||
smtp_security = none
|
||||
|
||||
# Specifies the From e-mail address value in the e-mails sent. Bounces will
|
||||
# be sent here.
|
||||
smtp_admin = root@localhost
|
||||
|
||||
# Time to wait, in milliseconds, between each e-mail sent to try to avoid
|
||||
# overloading the mail queue.
|
||||
smtp_delay = 0
|
||||
|
||||
# Specifies the From: e-mail address value in the e-mails sent.
|
||||
# The default when unset is noreply@ipadefaultemaildomain.
|
||||
# This value can be found by running ipa config-show.
|
||||
# mail_from =
|
||||
|
||||
# The list of days before a password expiration when ipa-epn should notify
|
||||
# a user that their password will soon require a reset.
|
||||
notify_ttls = 28, 14, 7, 3, 1
|
||||
|
||||
# Set the character set of the message.
|
||||
msg_charset = utf8
|
||||
|
||||
# Set the message's MIME sub-content type.
|
||||
msg_subtype = plain
|
||||
@@ -1,5 +0,0 @@
|
||||
Hi {{ fullname }},
|
||||
|
||||
Your password will expire on {{ expiration }}.
|
||||
|
||||
Please change it as soon as possible.
|
||||
@@ -1,8 +0,0 @@
|
||||
# IPA-related configuration changes to sshd_config
|
||||
|
||||
PubkeyAuthentication yes
|
||||
KerberosAuthentication no
|
||||
GSSAPIAuthentication yes
|
||||
UsePAM yes
|
||||
ChallengeResponseAuthentication yes
|
||||
$SSSD_SSHD_OPTIONS
|
||||
Reference in New Issue
Block a user