URL: https://github.com/SSSD/sssd/pull/218
Author: celestian
Title: #218: TEST: Adding krb5-libs to dependencies
Action: synchronized
To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/218/head:pr218
git checkout pr218
From f5da29493c90d8cdea1b54912952c275a9bcc8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C4=8Cech?= <pc...@redhat.com>
Date: Thu, 30 Mar 2017 12:05:08 +0200
Subject: [PATCH] intg: Add check for krb5-{server,workstation} binaries
The $PATH in our internal CI machines do not include sbin (at least when
running intgcheck), which forced us to manually include it there as part
of this patch. Otherwise the patches would fail in all supported CI
distros.
Resolves:
https://pagure.io/SSSD/sssd/issue/3353
---
contrib/ci/run | 6 +++++-
src/external/intgcheck.m4 | 8 ++++++++
src/external/krb5.m4 | 9 +++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/contrib/ci/run b/contrib/ci/run
index aa6d35abe..0fa741291 100755
--- a/contrib/ci/run
+++ b/contrib/ci/run
@@ -19,7 +19,11 @@
set -o nounset -o pipefail -o errexit
declare -r CI_DIR=`dirname "\`readlink -f \"\$0\"\`"`
-export PATH=$CI_DIR:$PATH
+# sbin is not part of the PATH when running our CI.
+# As some binaries checks depend on having sbin in the
+# PATH, let's add it manually here.
+declare -r SBIN_PATH="/usr/local/sbin:/sbin:/usr/sbin"
+export PATH=$CI_DIR:$SBIN_PATH:$PATH
export LC_ALL=C
. deps.sh
diff --git a/src/external/intgcheck.m4 b/src/external/intgcheck.m4
index ac68b85dd..89ea06b5a 100644
--- a/src/external/intgcheck.m4
+++ b/src/external/intgcheck.m4
@@ -29,5 +29,13 @@ AC_DEFUN([SSS_ENABLE_INTGCHECK_REQS], [
SSS_INTGCHECK_REQ([HAVE_PYTEST], [pytest])
SSS_INTGCHECK_REQ([HAVE_PY2MOD_LDAP], [python-ldap])
SSS_INTGCHECK_REQ([HAVE_PY2MOD_LDAP], [pyldb])
+ SSS_INTGCHECK_REQ([HAVE_KRB5KDC], [krb5kdc])
+ SSS_INTGCHECK_REQ([HAVE_KDB5_UTIL], [kdb5_util])
+ SSS_INTGCHECK_REQ([HAVE_KINIT], [kinit])
+ SSS_INTGCHECK_REQ([HAVE_KVNO], [kvno])
+ SSS_INTGCHECK_REQ([HAVE_KDESTROY], [kdestroy])
+ SSS_INTGCHECK_REQ([HAVE_KSWITCH], [kswitch])
+ SSS_INTGCHECK_REQ([HAVE_KLIST], [klist])
+ SSS_INTGCHECK_REQ([HAVE_KADMIN_LOCAL], [kadmin.local])
fi
])
diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
index b844c2fbe..b4e213a73 100644
--- a/src/external/krb5.m4
+++ b/src/external/krb5.m4
@@ -114,3 +114,12 @@ AM_COND_IF([BUILD_KRB5_LOCALAUTH_PLUGIN],
CFLAGS=$SAVE_CFLAGS
LIBS=$SAVE_LIBS
+
+AC_CHECK_PROG([HAVE_KRB5KDC], [krb5kdc], [yes], [no])
+AC_CHECK_PROG([HAVE_KDB5_UTIL], [kdb5_util], [yes], [no])
+AC_CHECK_PROG([HAVE_KINIT], [kinit], [yes], [no])
+AC_CHECK_PROG([HAVE_KVNO], [kvno], [yes], [no])
+AC_CHECK_PROG([HAVE_KDESTROY], [kdestroy], [yes], [no])
+AC_CHECK_PROG([HAVE_KSWITCH], [kswitch], [yes], [no])
+AC_CHECK_PROG([HAVE_KLIST], [klist], [yes], [no])
+AC_CHECK_PROG([HAVE_KADMIN_LOCAL], [kadmin.local], [yes], [no])
_______________________________________________
sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org
To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
