From 51c425dc9354bcb1fd7a73beea7139a767dd06dc Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 27 Jun 2023 21:00:00 +0000 Subject: [PATCH] pwquality: remove old built-in cracklib dictionary workaround The first version of libpwquality with the required change was 1.4.1 released in 2019. --- meson.build | 4 +++- src/shared/pwquality-util.c | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 9f355bf5695..e6ea55c0d9f 100644 --- a/meson.build +++ b/meson.build @@ -1196,7 +1196,9 @@ conf.set10('HAVE_LIBFDISK', have) want_pwquality = get_option('pwquality') if want_pwquality != 'false' and not skip_deps - libpwquality = dependency('pwquality', required : want_pwquality == 'true') + libpwquality = dependency('pwquality', + version : '>= 1.4.1', + required : want_pwquality == 'true') have = libpwquality.found() else have = false diff --git a/src/shared/pwquality-util.c b/src/shared/pwquality-util.c index 12efe626081..839cf4caf99 100644 --- a/src/shared/pwquality-util.c +++ b/src/shared/pwquality-util.c @@ -50,10 +50,6 @@ void pwq_maybe_disable_dictionary(pwquality_settings_t *pwq) { return; } - // REMOVE THIS AS SOON AS https://github.com/libpwquality/libpwquality/pull/21 IS MERGED AND RELEASED - if (isempty(path)) - path = "/usr/share/cracklib/pw_dict.pwd.gz"; - if (isempty(path)) { log_debug("Weird, no dictionary file configured, ignoring."); return; -- 2.47.3