-@@ -1316,12 +1316,21 @@
- * If we failed for any reason to produce global
- * list of supported enctypes, use local default here.
- */
-+#ifdef HAVE_HEIMDAL
-+ if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
-+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+ num_enctypes, enctypes);
-+ else
-+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-+ num_krb5_enctypes, krb5_enctypes);
-+#else
- if (krb5_enctypes == NULL || limit_to_legacy_enctypes)
- maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- &krb5oid, num_enctypes, enctypes);
- else
- maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
- &krb5oid, num_krb5_enctypes, krb5_enctypes);
-+#endif
-
- if (maj_stat != GSS_S_COMPLETE) {
- pgsserr("gss_set_allowable_enctypes",
---- nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c~ 2011-06-30 15:00:42.000000000 +0200
-+++ nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c 2011-08-03 12:40:53.865782009 +0200
-@@ -186,8 +186,13 @@
- num_enctypes = default_num_enctypes;
- }
-
-+#ifdef HAVE_HEIMDAL
-+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gssd_creds,
-+ num_enctypes, enctypes);
-+#else
- maj_stat = gss_set_allowable_enctypes(&min_stat, gssd_creds,
- &krb5oid, num_enctypes, enctypes);
-+#endif
- if (maj_stat != GSS_S_COMPLETE) {
- printerr(1, "WARNING: gss_set_allowable_enctypes failed\n");
- pgsserr("svcgssd_limit_krb5_enctypes: gss_set_allowable_enctypes",