From 3fc2eda4e15e9592132062036d70acad3bab401c Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 24 Sep 2020 15:33:17 -0400 Subject: [PATCH] Require libpwolicy and configure it in the build system https://pagure.io/freeipa/issue/6964 https://pagure.io/freeipa/issue/5948 https://pagure.io/freeipa/issue/2445 https://pagure.io/freeipa/issue/298 Signed-off-by: Rob Crittenden Reviewed-By: Alexander Bokovoy Reviewed-By: Christian Heimes --- configure.ac | 6 ++++++ freeipa.spec.in | 4 ++++ util/Makefile.am | 7 ++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1a6e40c7c..cda7d75af 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,11 @@ dnl - Check for OpenSSL Crypto library dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES([CRYPTO], [libcrypto]) +dnl --------------------------------------------------------------------------- +dnl - Check for pwquality library +dnl --------------------------------------------------------------------------- +PKG_CHECK_MODULES([PWQUALITY], [pwquality]) + dnl --------------------------------------------------------------------------- dnl - Check for Python 3 dnl - Check for platform Python interpreter @@ -665,6 +670,7 @@ echo " jslint: ${JSLINT} LDAP libs: ${LDAP_LIBS} OpenSSL crypto libs: ${CRYPTO_LIBS} + pwquality libs: ${PWQUALITY_LIBS} KRB5 libs: ${KRB5_LIBS} systemdsystemunitdir: ${systemdsystemunitdir}" diff --git a/freeipa.spec.in b/freeipa.spec.in index da42ef22e..ae684c67d 100755 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -216,6 +216,7 @@ BuildRequires: samba-devel >= %{samba_version} BuildRequires: libtalloc-devel BuildRequires: libtevent-devel BuildRequires: libuuid-devel +BuildRequires: libpwquality-devel BuildRequires: libsss_idmap-devel BuildRequires: libsss_certmap-devel BuildRequires: libsss_nss_idmap-devel >= %{sssd_version} @@ -231,6 +232,7 @@ BuildRequires: libunistring-devel # 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773 # 0.13.0-2: fix for missing dependency on python-six BuildRequires: python3-lesscpy >= 0.13.0-2 +BuildRequires: cracklib-dicts # ONLY_CLIENT %endif @@ -407,6 +409,8 @@ Requires: oddjob # 0.7.0-2: https://pagure.io/gssproxy/pull-request/172 Requires: gssproxy >= 0.7.0-2 Requires: sssd-dbus >= %{sssd_version} +Requires: libpwquality +Requires: cracklib-dicts Provides: %{alt_name}-server = %{version} Conflicts: %{alt_name}-server diff --git a/util/Makefile.am b/util/Makefile.am index a2400063d..319809ba3 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = 1.7 subdir-objects -AM_CPPFLAGS = $(CRYPTO_CFLAGS) $(KRB5_CFLAGS) $(LDAP_CFLAGS) +AM_CPPFLAGS = $(CRYPTO_CFLAGS) $(KRB5_CFLAGS) $(LDAP_CFLAGS) $(PWQUALITY_CFLAGS) noinst_LTLIBRARIES = libutil.la @@ -13,8 +13,9 @@ libutil_la_SOURCES = ipa_krb5.c \ ipa_pwd.h \ ipa_pwd_ntlm.c -libutil_la_LIBADD = $(CRYPTO_LIBS) $(KRB5_LIBS) $(LDAP_LIBS) +libutil_la_LIBADD = $(CRYPTO_LIBS) $(KRB5_LIBS) $(LDAP_LIBS) $(PWQUALITY_LIBS) -check_PROGRAMS = t_pwd +check_PROGRAMS = t_pwd t_policy TESTS = $(check_PROGRAMS) t_pwd_LDADD = libutil.la +t_policy_LDADD = libutil.la