URL: https://github.com/SSSD/sssd/pull/699
Author: sumit-bose
Title: #699: Fixes for MIT Kerberos 1.17 and valgind CI runs
Action: opened
PR body:
"""
None
"""
To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/699/head:pr699
git checkout pr699
From d03fb2e4661ca970d78239c75ea7d843186cf559 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sb...@redhat.com>
Date: Thu, 22 Nov 2018 11:33:20 +0100
Subject: [PATCH 1/3] BUILD: Accept krb5 1.17 for building the PAC plugin
---
src/external/pac_responder.m4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4
index e0685f0ce3..dc986a1b8a 100644
--- a/src/external/pac_responder.m4
+++ b/src/external/pac_responder.m4
@@ -18,7 +18,8 @@ then
Kerberos\ 5\ release\ 1.13* | \
Kerberos\ 5\ release\ 1.14* | \
Kerberos\ 5\ release\ 1.15* | \
- Kerberos\ 5\ release\ 1.16*)
+ Kerberos\ 5\ release\ 1.16* | \
+ Kerberos\ 5\ release\ 1.17*)
krb5_version_ok=yes
AC_MSG_RESULT([yes])
;;
From 2470d1f5ce1e499f7a8f80c58e29a13860434010 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sb...@redhat.com>
Date: Thu, 22 Nov 2018 11:36:57 +0100
Subject: [PATCH 2/3] tests: fix mocking krb5_creds in test_copy_ccache
To just test some ccache related functionality without talking to an
actual KDC to get the tickets some needed libkrb5 structs were mocked
based on tests from the MIT Kerberos source code. One struct member
(is_skey) was so far not regarded by libkrb5 for out test case. But a
recent fix for http://krbdev.mit.edu/rt/Ticket/Display.html?id=8718
changed this and we have to change the mocking.
---
src/tests/cmocka/test_copy_ccache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/cmocka/test_copy_ccache.c b/src/tests/cmocka/test_copy_ccache.c
index 84225b6bff..7c76c00e8f 100644
--- a/src/tests/cmocka/test_copy_ccache.c
+++ b/src/tests/cmocka/test_copy_ccache.c
@@ -88,7 +88,7 @@ static int setup_ccache(void **state)
test_creds.times.starttime = 2222;
test_creds.times.endtime = 3333;
test_creds.times.renew_till = 4444;
- test_creds.is_skey = 1;
+ test_creds.is_skey = 0;
test_creds.ticket_flags = 5555;
test_creds.addresses = addrs;
From f66a38e58b969294100b9ac93e83b4491a69d317 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sb...@redhat.com>
Date: Thu, 22 Nov 2018 12:12:00 +0100
Subject: [PATCH 3/3] tests: increase p11_child_timeout
With recent version of valgrind some tests failed during a CI run with a
timeout. To avoid this the related p11_child_timeout is increased for
the affected tests.
---
src/tests/cmocka/test_cert_utils.c | 2 +-
src/tests/cmocka/test_ssh_srv.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tests/cmocka/test_cert_utils.c b/src/tests/cmocka/test_cert_utils.c
index 26fffb870c..ec5858b6e2 100644
--- a/src/tests/cmocka/test_cert_utils.c
+++ b/src/tests/cmocka/test_cert_utils.c
@@ -50,7 +50,7 @@
/* When run under valgrind with --trace-children=yes we have to increase the
* timeout not because p11_child needs much more time under valgrind but
* because of the way valgrind handles the children. */
-#define P11_CHILD_TIMEOUT 40
+#define P11_CHILD_TIMEOUT 80
/* TODO: create a certificate for this test */
const uint8_t test_cert_der[] = {
diff --git a/src/tests/cmocka/test_ssh_srv.c b/src/tests/cmocka/test_ssh_srv.c
index 93217a1979..d611bdcfff 100644
--- a/src/tests/cmocka/test_ssh_srv.c
+++ b/src/tests/cmocka/test_ssh_srv.c
@@ -223,7 +223,7 @@ static int ssh_test_setup(void **state)
* the timeout not because p11_child needs much more time under valgrind
* but because of the way valgrind handles the children. */
struct sss_test_conf_param ssh_params[] = {
- { "p11_child_timeout", "40" },
+ { "p11_child_timeout", "80" },
{ NULL, NULL }, /* Sentinel */
};
_______________________________________________
sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org
To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedorahosted.org/archives/list/sssd-devel@lists.fedorahosted.org
