nfs-utils-no_libgssapi.patch

   1 Index: nfs-utils-1.1.0/utils/gssd/context_lucid.c
   2 ===================================================================
   3 --- nfs-utils-1.1.0.orig/utils/gssd/context_lucid.c
   4 +++ nfs-utils-1.1.0/utils/gssd/context_lucid.c
   5 @@ -48,8 +48,10 @@
   6  #include "context.h"
   7
   8  #ifndef OM_uint64
   9 +#ifndef GSSAPI_GSSAPI_H_
  10  typedef uint64_t OM_uint64;
  11  #endif
  12 +#endif
  13
  14  static int
  15  write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key)
  16 @@ -171,10 +173,10 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss
  17         int retcode = 0;
  18
  19         printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
  20 -       maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
  21 +       maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
  22                                                 1, &return_ctx);
  23         if (maj_stat != GSS_S_COMPLETE) {
  24 -               pgsserr("gss_export_lucid_sec_context",
  25 +               pgsserr("gss_krb5_export_lucid_sec_context",
  26                         maj_stat, min_stat, &krb5oid);
  27                 goto out_err;
  28         }
  29 @@ -198,9 +200,9 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss
  30         else
  31                 retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf);
  32
  33 -       maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
  34 +       maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, return_ctx);
  35         if (maj_stat != GSS_S_COMPLETE) {
  36 -               pgsserr("gss_export_lucid_sec_context",
  37 +               pgsserr("gss_krb5_free_lucid_sec_context",
  38                         maj_stat, min_stat, &krb5oid);
  39                 printerr(0, "WARN: failed to free lucid sec context\n");
  40         }
  41 Index: nfs-utils-1.1.0/utils/gssd/krb5_util.c
  42 ===================================================================
  43 --- nfs-utils-1.1.0.orig/utils/gssd/krb5_util.c
  44 +++ nfs-utils-1.1.0/utils/gssd/krb5_util.c
  45 @@ -1317,13 +1317,13 @@ limit_krb5_enctypes(struct rpc_gss_sec *
  46          * list of supported enctypes, use local default here.
  47          */
  48         if (krb5_enctypes == NULL)
  49 -               maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
  50 -                                       &krb5oid, num_enctypes, enctypes);
  51 +               maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
  52 +                                       num_enctypes, enctypes);
  53         else
  54 -               maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
  55 -                                       &krb5oid, num_krb5_enctypes, krb5_enctypes);
  56 +               maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
  57 +                                       num_krb5_enctypes, krb5_enctypes);
  58
  59         if (maj_stat != GSS_S_COMPLETE) {
  60 -               pgsserr("gss_set_allowable_enctypes",
  61 +               pgsserr("gss_krb5_set_allowable_enctypes",
  62                         maj_stat, min_stat, &krb5oid);
  63                 gss_release_cred(&min_stat, &credh);
  64                 return -1;