diff options
| author | Simo Sorce <ssorce@redhat.com> | 2012-01-11 16:43:42 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2012-01-12 09:26:25 -0500 |
| commit | d27bffe0a877425fee90a7c87db4d9c2c7ae7e8a (patch) | |
| tree | 9687dbf21b9a6c1af84e47edc0f3e8ee5f7387e3 /daemons | |
| parent | 55395770456e72fedd935b01a64c2f635bd81394 (diff) | |
| download | freeipa.git-d27bffe0a877425fee90a7c87db4d9c2c7ae7e8a.tar.gz freeipa.git-d27bffe0a877425fee90a7c87db4d9c2c7ae7e8a.tar.xz freeipa.git-d27bffe0a877425fee90a7c87db4d9c2c7ae7e8a.zip | |
Disable MS-PAC handling in 2.2
This removes the dependency on samba4-libs
https://fedorahosted.org/freeipa/ticket/2244
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/configure.ac | 9 | ||||
| -rw-r--r-- | daemons/ipa-kdb/Makefile.am | 3 | ||||
| -rw-r--r-- | daemons/ipa-kdb/ipa_kdb.c | 5 | ||||
| -rw-r--r-- | daemons/ipa-kdb/ipa_kdb.h | 2 |
4 files changed, 5 insertions, 14 deletions
diff --git a/daemons/configure.ac b/daemons/configure.ac index f89c50d6..b1924fdd 100644 --- a/daemons/configure.ac +++ b/daemons/configure.ac @@ -226,15 +226,6 @@ if test "x$PYTHON" = "x" ; then AC_MSG_ERROR([Python not found]) fi -dnl --------------------------------------------------------------------------- -dnl Check for ndr_krb5pac -dnl --------------------------------------------------------------------------- - -PKG_PROG_PKG_CONFIG() -PKG_CHECK_MODULES([TALLOC], [talloc]) -PKG_CHECK_MODULES([TEVENT], [tevent]) -PKG_CHECK_MODULES([NDRPAC], [ndr_krb5pac]) - dnl --------------------------------------------------------------------------- dnl - Set the data install directory since we don't use pkgdatadir diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 77b92e8d..f0b5f756 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -18,7 +18,6 @@ INCLUDES = \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(WARN_CFLAGS) \ - $(NDRPAC_CFLAGS) \ $(NULL) plugindir = $(libdir)/krb5/plugins/kdb @@ -33,7 +32,6 @@ ipadb_la_SOURCES = \ ipa_kdb_passwords.c \ ipa_kdb_principals.c \ ipa_kdb_pwdpolicy.c \ - ipa_kdb_mspac.c \ ipa_kdb_delegation.c \ $(KRB5_UTIL_SRCS) \ $(NULL) @@ -46,7 +44,6 @@ ipadb_la_LDFLAGS = \ ipadb_la_LIBADD = \ $(KRB5_LIBS) \ $(LDAP_LIBS) \ - $(NDRPAC_LIBS) \ $(NULL) dist_noinst_DATA = ipa_kdb.exports diff --git a/daemons/ipa-kdb/ipa_kdb.c b/daemons/ipa-kdb/ipa_kdb.c index ca266d54..863e421b 100644 --- a/daemons/ipa-kdb/ipa_kdb.c +++ b/daemons/ipa-kdb/ipa_kdb.c @@ -259,11 +259,12 @@ int ipadb_get_connection(struct ipadb_context *ipactx) ipactx->supp_encs = kst; ipactx->n_supp_encs = n_kst; +#if 0 ret = ipadb_reinit_mspac(ipactx); if (ret && ret != ENOENT) { /* TODO: log that there is an issue with adtrust settings */ } - +#endif ret = 0; done: @@ -452,7 +453,7 @@ kdb_vftabl kdb_function_table = { NULL, /* promote_db */ NULL, /* decrypt_key_data */ NULL, /* encrypt_key_data */ - ipadb_sign_authdata, /* sign_authdata */ + NULL, /*ipadb_sign_authdata, */ /* sign_authdata */ NULL, /* check_transited_realms */ NULL, /* check_policy_as */ NULL, /* check_policy_tgs */ diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h index 2531d032..03bfdbcf 100644 --- a/daemons/ipa-kdb/ipa_kdb.h +++ b/daemons/ipa-kdb/ipa_kdb.h @@ -206,6 +206,7 @@ krb5_error_code ipadb_get_pwd_expiration(krb5_context context, struct ipadb_e_data *ied, time_t *expire_time); +#if 0 /* MS-PAC FUNCTIONS */ krb5_error_code ipadb_sign_authdata(krb5_context context, @@ -223,6 +224,7 @@ krb5_error_code ipadb_sign_authdata(krb5_context context, krb5_authdata ***signed_auth_data); krb5_error_code ipadb_reinit_mspac(struct ipadb_context *ipactx); +#endif /* DELEGATION CHECKS */ |