- git patch with nfs-utils-1-2-3-rc4 changes

[packages/nfs-utils.git] / nfs-utils-no_libgssapi.patch

diff --git a/nfs-utils-no_libgssapi.patch b/nfs-utils-no_libgssapi.patch
index 1d5b8a674076750cba0195dc03ddb874cf0adeb9..68a2b0e5f58f1aa861185399afa4c9ad2b42fe56 100644 (file)
--- a/nfs-utils-no_libgssapi.patch
+++ b/nfs-utils-no_libgssapi.patch
@@ -16,7 +16,7 @@ Index: nfs-utils-1.1.0/utils/gssd/context_lucid.c
 @@ -171,10 +173,10 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss
        int retcode = 0;
  
-       printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");
+       printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
 -      maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
 +      maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
                                                1, &return_ctx);
@@ -31,10 +31,10 @@ Index: nfs-utils-1.1.0/utils/gssd/context_lucid.c
                retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf);
  
 -      maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
-+      maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx);
++      maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, return_ctx);
        if (maj_stat != GSS_S_COMPLETE) {
 -              pgsserr("gss_export_lucid_sec_context",
-+              pgsserr("gss_krb5_export_lucid_sec_context",
++              pgsserr("gss_krb5_free_lucid_sec_context",
                        maj_stat, min_stat, &krb5oid);
                printerr(0, "WARN: failed to free lucid sec context\n");
        }
@@ -42,13 +42,20 @@ Index: nfs-utils-1.1.0/utils/gssd/krb5_util.c
 ===================================================================
 --- nfs-utils-1.1.0.orig/utils/gssd/krb5_util.c
 +++ nfs-utils-1.1.0/utils/gssd/krb5_util.c
-@@ -294,10 +294,10 @@ limit_krb5_enctypes(struct rpc_gss_sec *
-               return -1;
-       }
+@@ -1317,13 +1317,13 @@ limit_krb5_enctypes(struct rpc_gss_sec *
+        * list of supported enctypes, use local default here.
+        */
+       if (krb5_enctypes == NULL)
+-              maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
+-                                      &krb5oid, num_enctypes, enctypes);
++              maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
++                                      num_enctypes, enctypes);
+       else
+-              maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
+-                                      &krb5oid, num_krb5_enctypes, krb5_enctypes);
++              maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
++                                      num_krb5_enctypes, krb5_enctypes);
  
--      maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid,
-+      maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
-                                            num_enctypes, &enctypes);
        if (maj_stat != GSS_S_COMPLETE) {
 -              pgsserr("gss_set_allowable_enctypes",
 +              pgsserr("gss_krb5_set_allowable_enctypes",