diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2014-08-15 14:56:39 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@redhat.com> | 2014-08-15 14:56:39 -0400 |
| commit | 2184fad363a1fc13fc0bb625a010ccdfc18abea7 (patch) | |
| tree | ac54077d6fdcb37776cb4b59d7572a9b1a96624d | |
| parent | 7041f914bd9a17e69539f6124ad4f062c554a28d (diff) | |
| download | krb5-2184fad363a1fc13fc0bb625a010ccdfc18abea7.tar.gz krb5-2184fad363a1fc13fc0bb625a010ccdfc18abea7.tar.xz krb5-2184fad363a1fc13fc0bb625a010ccdfc18abea7.zip | |
drop patch for RT#7926, fixed in 1.12.2
| -rw-r--r-- | krb5-master-mechd.patch | 38 | ||||
| -rw-r--r-- | krb5.spec | 1 |
2 files changed, 1 insertions, 38 deletions
diff --git a/krb5-master-mechd.patch b/krb5-master-mechd.patch index 8982fdd..965a436 100644 --- a/krb5-master-mechd.patch +++ b/krb5-master-mechd.patch @@ -273,41 +273,3 @@ index f0acf1a..8bce14c 100644 } /* - -commit 41d38531043b99e8daa334f2b6ddf376adf1e878 -Author: Sam Hartman <hartmans@debian.org> -Date: Wed Jun 4 12:06:27 2014 -0400 - - Do not loop on add_cred_from and other new methods - - Several new GSS-API methods were added but GSSAPI_ADD_METHOD was - called to add them rather than GSSAPI_ADD_METHOD_NOLOOP. This means - that the implementation from the GSS-API mechglue would be used if the - mechanism had no implementation. As a result, the mechglue will call - into itself exhausting the call stack in an endless loop when one of - these methods is called. - - ticket: 7926 - target_version: 1.12.2 - tags: pullup - -diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c -index 8bce14c..b0eb40a 100644 ---- a/src/lib/gssapi/mechglue/g_initialize.c -+++ b/src/lib/gssapi/mechglue/g_initialize.c -@@ -703,11 +703,11 @@ build_dynamicMech(void *dl, const gss_OID mech_type) - GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_inquire_mech_for_saslname); - /* RFC 5587 */ - GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_inquire_attrs_for_mech); -- GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_acquire_cred_from); -- GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_store_cred_into); -+ GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_acquire_cred_from); -+ GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_store_cred_into); - GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_acquire_cred_with_password); -- GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_export_cred); -- GSS_ADD_DYNAMIC_METHOD(dl, mech, gss_import_cred); -+ GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_export_cred); -+ GSS_ADD_DYNAMIC_METHOD_NOLOOP(dl, mech, gss_import_cred); - GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_sec_context_by_mech); - GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_name_by_mech); - GSS_ADD_DYNAMIC_METHOD(dl, mech, gssspi_import_cred_by_mech); @@ -1040,6 +1040,7 @@ exit 0 - drop patch for RT#7836, fixed in 1.12.2 - drop patch for RT#7858, fixed in 1.12.2 - drop patch for RT#7924, fixed in 1.12.2 + - drop patch for RT#7926, fixed in 1.12.2 - replace older proposed changes for ksu with backports of the changes after review and merging upstream (#1015559, #1026099, #1118347) |