diff options
author | Sumit Bose <sbose@redhat.com> | 2018-02-07 17:10:08 +0100 |
---|---|---|
committer | Christian Heimes <cheimes@redhat.com> | 2018-02-08 08:52:28 +0100 |
commit | ec228f411e480e03108f0e0fec0f706e159ca61c (patch) | |
tree | d157636252d92da3012096a839759ecb11e82f81 /daemons | |
parent | df0e6696d8a2446965c8e1f4fe3f85c01f990ca9 (diff) | |
download | freeipa-ec228f411e480e03108f0e0fec0f706e159ca61c.tar.gz freeipa-ec228f411e480e03108f0e0fec0f706e159ca61c.tar.xz freeipa-ec228f411e480e03108f0e0fec0f706e159ca61c.zip |
ipa-kdb: use magic value to check if ipadb is used
The certauth plugin is configured in /etc/krb5.conf independently form
the database module. As a result the IPA certauth plugin can be added to
the configuration without the IPA DAL driver. Since the IPA certauth
plugin depends on the presence of the IPA DAL driver this patch adds a
magic value at the beginning of struct ipadb_context which can be
checked to see if the IPA DAL driver is properly initialized.
Resolves https://pagure.io/freeipa/issue/7261
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'daemons')
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb.c | 1 | ||||
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb.h | 2 | ||||
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb_certauth.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/daemons/ipa-kdb/ipa_kdb.c b/daemons/ipa-kdb/ipa_kdb.c index b11153ecc..222900ae7 100644 --- a/daemons/ipa-kdb/ipa_kdb.c +++ b/daemons/ipa-kdb/ipa_kdb.c @@ -522,6 +522,7 @@ static krb5_error_code ipadb_init_module(krb5_context kcontext, if (!ipactx) { return ENOMEM; } + ipactx->magic = IPA_CONTEXT_MAGIC; /* only check for unsupported 'temporary' value for now */ for (i = 0; db_args != NULL && db_args[i] != NULL; i++) { diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h index be2f45752..d187d969f 100644 --- a/daemons/ipa-kdb/ipa_kdb.h +++ b/daemons/ipa-kdb/ipa_kdb.h @@ -101,7 +101,9 @@ struct ipadb_global_config { bool disable_preauth_for_spns; }; +#define IPA_CONTEXT_MAGIC 0x0c027ea7 struct ipadb_context { + int magic; char *uri; char *base; char *realm; diff --git a/daemons/ipa-kdb/ipa_kdb_certauth.c b/daemons/ipa-kdb/ipa_kdb_certauth.c index 35e5e7d08..82589f2f9 100644 --- a/daemons/ipa-kdb/ipa_kdb_certauth.c +++ b/daemons/ipa-kdb/ipa_kdb_certauth.c @@ -131,7 +131,7 @@ static krb5_error_code ipa_get_init_data(krb5_context kcontext, krb5_klog_syslog(LOG_INFO, "Initializing IPA certauth plugin."); ipactx = ipadb_get_context(kcontext); - if (ipactx == NULL) { + if (ipactx == NULL || ipactx->magic != IPA_CONTEXT_MAGIC) { return KRB5_KDB_DBNOTINITED; } |