From d1f66a2bd7f841642395404a9e9b3f9935d504bb Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 18 Sep 2013 17:41:58 -0700 Subject: [PATCH] Fix the path to the Heimdal password strength header Expect the Heimdal password strength checking plugin header in kadm5/kadm5-pwcheck.h instead of outside of the kadm5 directory. This is the path used by current versions of Heimdal. --- NEWS | 4 ++++ configure.ac | 3 ++- plugin/heimdal.c | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index aab7775..7738132 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,10 @@ krb5-strength 2.0 (unreleased) which tightens the check somewhat for shorter passwords and loosens it considerably for longer passwords. + Expect the Heimdal password strength checking plugin header in + kadm5/kadm5-pwcheck.h instead of outside of the kadm5 directory. This + is the path used by current versions of Heimdal. + Update to rra-c-util 4.9: * Probe for Kerberos headers using file checks instead of compiles. diff --git a/configure.ac b/configure.ac index c81ed57..268086a 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,8 @@ AC_PROG_LIBTOOL RRA_LIB_CRACKLIB RRA_LIB_KRB5 RRA_LIB_KRB5_SWITCH -AC_CHECK_HEADERS([kadm5-pwcheck.h krb5/pwcheck_plugin.h]) +AC_CHECK_HEADERS([kadm5/kadm5-pwcheck.h krb5/pwcheck_plugin.h], [], [], + [RRA_INCLUDES_KRB5]) AC_CHECK_TYPES([krb5_realm], [], [], [RRA_INCLUDES_KRB5]) RRA_LIB_KRB5_RESTORE diff --git a/plugin/heimdal.c b/plugin/heimdal.c index fab2b9f..f02aa50 100644 --- a/plugin/heimdal.c +++ b/plugin/heimdal.c @@ -12,7 +12,7 @@ * instead. * * Written by Russ Allbery - * Copyright 2009 + * Copyright 2009, 2013 * The Board of Trustees of the Leland Stanford Junior Unversity * * See LICENSE for licensing terms. @@ -30,11 +30,11 @@ #ifdef HAVE_KRB5_REALM /* Used for unused parameters to silence gcc warnings. */ -#define UNUSED __attribute__((__unused__)) +# define UNUSED __attribute__((__unused__)) -/* kadm5-pwcheck.h isn't always installed by Heimdal. */ -# ifdef HAVE_KADM5_PWCHECK_H -# include +/* kadm5/kadm5-pwcheck.h isn't always installed by Heimdal. */ +# ifdef HAVE_KADM5_KADM5_PWCHECK_H +# include # else # define KADM5_PASSWD_VERSION_V1 1 -- 2.39.2