From a47382e30b86fb90495de5bab04690f215980ec4 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Thu, 25 Mar 2010 15:10:56 +0100 Subject: Regression test against RHBZ #576856 --- src/providers/ipa/ipa_common.c | 5 ----- src/providers/ipa/ipa_common.h | 5 +++++ src/tests/ipa_ldap_opt-tests.c | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index 1fc881f41..13bb11399 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -388,11 +388,6 @@ done: return ret; } -/* the following define is used to keep track of * the options in the krb5 - * module, so that if they change and ipa is not updated correspondingly - * this will trigger a runtime abort error */ -#define IPA_KRB5_OPTS_TEST 8 - int ipa_get_auth_options(struct ipa_options *ipa_opts, struct confdb_ctx *cdb, const char *conf_path, diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index 75be55e2d..571eee641 100644 --- a/src/providers/ipa/ipa_common.h +++ b/src/providers/ipa/ipa_common.h @@ -37,6 +37,11 @@ struct ipa_service { * this will trigger a runtime abort error */ #define IPA_OPTS_BASIC_TEST 32 +/* the following define is used to keep track of the options in the krb5 + * module, so that if they change and ipa is not updated correspondingly + * this will trigger a runtime abort error */ +#define IPA_KRB5_OPTS_TEST 8 + enum ipa_basic_opt { IPA_DOMAIN = 0, IPA_SERVER, diff --git a/src/tests/ipa_ldap_opt-tests.c b/src/tests/ipa_ldap_opt-tests.c index 4b4667a47..e9a9ea3ff 100644 --- a/src/tests/ipa_ldap_opt-tests.c +++ b/src/tests/ipa_ldap_opt-tests.c @@ -27,11 +27,13 @@ #include "providers/ipa/ipa_common.h" #include "providers/ldap/sdap.h" +#include "providers/krb5/krb5_common.h" #include "tests/common.h" START_TEST(test_check_num_opts) { fail_if(IPA_OPTS_BASIC_TEST != SDAP_OPTS_BASIC); + fail_if(IPA_KRB5_OPTS_TEST != KRB5_OPTS); } END_TEST -- cgit