diff --git a/debian/changelog b/debian/changelog index fc2042e39..c81543df2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ freeipa (4.4.4-1) UNRELEASED; urgency=medium * New upstream release. - CVE-2017-2590 + - ipa-kdb-support-dal-version-5-and-6.diff: Dropped, upstream. + - purge-firefox-extension.diff: Refreshed. * fix-is-running.diff: Add a third argument to is_running() in ipaplatform/debian/services.py. (Closes: #856533) * fix-kdcproxy-path.diff: Update debian/paths.py to use correct path diff --git a/debian/patches/ipa-kdb-support-dal-version-5-and-6.diff b/debian/patches/ipa-kdb-support-dal-version-5-and-6.diff deleted file mode 100644 index 8805bb4e9..000000000 --- a/debian/patches/ipa-kdb-support-dal-version-5-and-6.diff +++ /dev/null @@ -1,125 +0,0 @@ -commit 2775042787be4ea236c0b99dd75337414e24b89d -Author: Simo Sorce -Date: Tue Nov 1 15:13:14 2016 -0400 - - Support DAL version 5 and version 6 - - https://fedorahosted.org/freeipa/ticket/6466 - - Signed-off-by: Simo Sorce - Reviewed-By: Tomas Krizek - Reviewed-By: Robbie Harwood - -diff --git a/daemons/ipa-kdb/ipa_kdb.c b/daemons/ipa-kdb/ipa_kdb.c -index fbcb03b..e96353f 100644 ---- a/daemons/ipa-kdb/ipa_kdb.c -+++ b/daemons/ipa-kdb/ipa_kdb.c -@@ -625,45 +625,69 @@ static void ipadb_free(krb5_context context, void *ptr) - - /* KDB Virtual Table */ - -+#if KRB5_KDB_DAL_MAJOR_VERSION == 5 - kdb_vftabl kdb_function_table = { -- KRB5_KDB_DAL_MAJOR_VERSION, /* major version number */ -- 0, /* minor version number */ -- ipadb_init_library, /* init_library */ -- ipadb_fini_library, /* fini_library */ -- ipadb_init_module, /* init_module */ -- ipadb_fini_module, /* fini_module */ -- ipadb_create, /* create */ -- NULL, /* destroy */ -- ipadb_get_age, /* get_age */ -- NULL, /* lock */ -- NULL, /* unlock */ -- ipadb_get_principal, /* get_principal */ -- ipadb_free_principal, /* free_principal */ -- ipadb_put_principal, /* put_principal */ -- ipadb_delete_principal, /* delete_principal */ -- ipadb_iterate, /* iterate */ -- ipadb_create_pwd_policy, /* create_policy */ -- ipadb_get_pwd_policy, /* get_policy */ -- ipadb_put_pwd_policy, /* put_policy */ -- ipadb_iterate_pwd_policy, /* iter_policy */ -- ipadb_delete_pwd_policy, /* delete_policy */ -- ipadb_free_pwd_policy, /* free_policy */ -- ipadb_alloc, /* alloc */ -- ipadb_free, /* free */ -- ipadb_fetch_master_key, /* fetch_master_key */ -- NULL, /* fetch_master_key_list */ -- ipadb_store_master_key_list, /* store_master_key_list */ -- NULL, /* dbe_search_enctype */ -- ipadb_change_pwd, /* change_pwd */ -- NULL, /* promote_db */ -- NULL, /* decrypt_key_data */ -- NULL, /* encrypt_key_data */ -- ipadb_sign_authdata, /* sign_authdata */ -- ipadb_check_transited_realms, /* check_transited_realms */ -- ipadb_check_policy_as, /* check_policy_as */ -- NULL, /* check_policy_tgs */ -- ipadb_audit_as_req, /* audit_as_req */ -- NULL, /* refresh_config */ -- ipadb_check_allowed_to_delegate /* check_allowed_to_delegate */ -+ .maj_ver = KRB5_KDB_DAL_MAJOR_VERSION, -+ .min_ver = 0, -+ .init_library = ipadb_init_library, -+ .fini_library = ipadb_fini_library, -+ .init_module = ipadb_init_module, -+ .fini_module = ipadb_fini_module, -+ .create = ipadb_create, -+ .get_age = ipadb_get_age, -+ .get_principal = ipadb_get_principal, -+ .free_principal = ipadb_free_principal, -+ .put_principal = ipadb_put_principal, -+ .delete_principal = ipadb_delete_principal, -+ .iterate = ipadb_iterate, -+ .create_policy = ipadb_create_pwd_policy, -+ .get_policy = ipadb_get_pwd_policy, -+ .put_policy = ipadb_put_pwd_policy, -+ .iter_policy = ipadb_iterate_pwd_policy, -+ .delete_policy = ipadb_delete_pwd_policy, -+ .free_policy = ipadb_free_pwd_policy, -+ .alloc = ipadb_alloc, -+ .free = ipadb_free, -+ .fetch_master_key = ipadb_fetch_master_key, -+ .store_master_key_list = ipadb_store_master_key_list, -+ .change_pwd = ipadb_change_pwd, -+ .sign_authdata = ipadb_sign_authdata, -+ .check_transited_realms = ipadb_check_transited_realms, -+ .check_policy_as = ipadb_check_policy_as, -+ .audit_as_req = ipadb_audit_as_req, -+ .check_allowed_to_delegate = ipadb_check_allowed_to_delegate - }; - -+#elif KRB5_KDB_DAL_MAJOR_VERSION == 6 -+kdb_vftabl kdb_function_table = { -+ .maj_ver = KRB5_KDB_DAL_MAJOR_VERSION, -+ .min_ver = 0, -+ .init_library = ipadb_init_library, -+ .fini_library = ipadb_fini_library, -+ .init_module = ipadb_init_module, -+ .fini_module = ipadb_fini_module, -+ .create = ipadb_create, -+ .get_age = ipadb_get_age, -+ .get_principal = ipadb_get_principal, -+ .put_principal = ipadb_put_principal, -+ .delete_principal = ipadb_delete_principal, -+ .iterate = ipadb_iterate, -+ .create_policy = ipadb_create_pwd_policy, -+ .get_policy = ipadb_get_pwd_policy, -+ .put_policy = ipadb_put_pwd_policy, -+ .iter_policy = ipadb_iterate_pwd_policy, -+ .delete_policy = ipadb_delete_pwd_policy, -+ .fetch_master_key = ipadb_fetch_master_key, -+ .store_master_key_list = ipadb_store_master_key_list, -+ .change_pwd = ipadb_change_pwd, -+ .sign_authdata = ipadb_sign_authdata, -+ .check_transited_realms = ipadb_check_transited_realms, -+ .check_policy_as = ipadb_check_policy_as, -+ .audit_as_req = ipadb_audit_as_req, -+ .check_allowed_to_delegate = ipadb_check_allowed_to_delegate -+}; -+ -+#else -+#error unsupported DAL major version -+#endif -+ diff --git a/debian/patches/purge-firefox-extension.diff b/debian/patches/purge-firefox-extension.diff index aa13dae36..456562d17 100644 --- a/debian/patches/purge-firefox-extension.diff +++ b/debian/patches/purge-firefox-extension.diff @@ -6,8 +6,8 @@ Date: Tue Mar 29 21:33:15 2016 +0300 --- a/freeipa.spec.in +++ b/freeipa.spec.in -@@ -165,7 +165,6 @@ Requires: pki-ca >= 10.3.5-6 - Requires: pki-kra >= 10.3.5-6 +@@ -174,7 +174,6 @@ Requires: pki-ca >= 10.3.5-11 + Requires: pki-kra >= 10.3.5-11 Requires(preun): python systemd-units Requires(postun): python systemd-units -Requires: zip @@ -589,7 +589,7 @@ Date: Tue Mar 29 21:33:15 2016 +0300 ca_db.publish_ca_cert(paths.CA_CRT) --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py -@@ -186,12 +186,10 @@ def install_http(config, auto_redirect, +@@ -194,12 +194,10 @@ def install_http(config, auto_redirect, http = httpinstance.HTTPInstance() http.create_instance( config.realm_name, config.host_name, config.domain_name, diff --git a/debian/patches/series b/debian/patches/series index c5a4bb28c..b66e65c81 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ # upstreamed -ipa-kdb-support-dal-version-5-and-6.diff # not upstreamable prefix.patch