- updated to 2.5.1

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

diff --git a/nfs-utils-heimdal.patch b/nfs-utils-heimdal.patch
index d6debaa09a70e32c7f23ba71f1c03214e3ea1cc3..f3b3850e26d7ac9df841d9a9674d3ab8b54f0272 100644 (file)
--- a/nfs-utils-heimdal.patch
+++ b/nfs-utils-heimdal.patch
@@ -13,9 +13,75 @@
           AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
           KRBDIR="$dir"
           gssapi_lib=gssapi
---- nfs-utils-2.3.2/utils/gssd/krb5_util.c.orig        2018-05-22 20:33:01.000000000 +0200
-+++ nfs-utils-2.3.2/utils/gssd/krb5_util.c     2018-08-28 17:25:00.834953411 +0200
-@@ -966,9 +966,37 @@
+--- nfs-utils-2.5.1/utils/gssd/krb5_util.c.orig        2020-06-18 19:10:06.000000000 +0200
++++ nfs-utils-2.5.1/utils/gssd/krb5_util.c     2020-08-22 18:47:27.393014417 +0200
+@@ -484,7 +484,7 @@
+       if (ccache)
+               krb5_cc_close(context, ccache);
+       krb5_free_cred_contents(context, &my_creds);
+-      krb5_free_string(context, k5err);
++      free(k5err);
+       return (code);
+ }
+ 
+@@ -723,7 +723,7 @@
+                                "we failed to unparse principal name: %s\n",
+                                k5err);
+                       k5_free_kt_entry(context, kte);
+-                      krb5_free_string(context, k5err);
++                      free(k5err);
+                       k5err = NULL;
+                       continue;
+               }
+@@ -770,7 +770,7 @@
+       if (retval < 0)
+               retval = 0;
+   out:
+-      krb5_free_string(context, k5err);
++      free(k5err);
+       return retval;
+ }
+ 
+@@ -836,7 +836,11 @@
+               myhostad[i+1] = 0;
+       }
+       if (adhostoverride)
++#ifdef HAVE_HEIMDAL
++              free(adhostoverride);
++#else
+               krb5_free_string(context, adhostoverride);
++#endif
+ 
+       if (!srchost) {
+               retval = get_full_hostname(myhostname, myhostname, sizeof(myhostname));
+@@ -927,7 +931,7 @@
+                               k5err = gssd_k5_err_msg(context, code);
+                               printerr(1, "%s while building principal for '%s'\n",
+                                        k5err, spn);
+-                              krb5_free_string(context, k5err);
++                              free(k5err);
+                               k5err = NULL;
+                               continue;
+                       }
+@@ -937,7 +941,7 @@
+                               k5err = gssd_k5_err_msg(context, code);
+                               printerr(3, "%s while getting keytab entry for '%s'\n",
+                                        k5err, spn);
+-                              krb5_free_string(context, k5err);
++                              free(k5err);
+                               k5err = NULL;
+                               /*
+                                * We tried the active directory machine account
+@@ -986,7 +990,7 @@
+               k5_free_default_realm(context, default_realm);
+       if (realmnames)
+               krb5_free_host_realm(context, realmnames);
+-      krb5_free_string(context, k5err);
++      free(k5err);
+       return retval;
+ }
+ 
+@@ -1003,9 +1007,37 @@
  {
        krb5_error_code ret;
        krb5_creds creds;
@@ -54,7 +120,7 @@
        ret = krb5_cc_start_seq_get(context, ccache, &cur);
        if (ret) 
                return 0;
-@@ -988,6 +1016,7 @@
+@@ -1025,6 +1057,7 @@
                krb5_free_cred_contents(context, &creds);
        }
        krb5_cc_end_seq_get(context, ccache, &cur);
@@ -62,7 +128,7 @@
  
        return found;
  }
-@@ -1034,6 +1063,9 @@
+@@ -1071,6 +1104,9 @@
        }
        krb5_free_principal(context, principal);
  err_princ:
@@ -72,7 +138,41 @@
        krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
        krb5_cc_close(context, ccache);
  err_cache:
-@@ -1323,7 +1355,7 @@
+@@ -1249,7 +1285,7 @@
+                       printerr(0, "WARNING: %s while resolving credential "
+                                   "cache '%s' for destruction\n", k5err,
+                                   ple->ccname);
+-                      krb5_free_string(context, k5err);
++                      free(k5err);
+                       k5err = NULL;
+                       continue;
+               }
+@@ -1258,13 +1294,13 @@
+                       k5err = gssd_k5_err_msg(context, code);
+                       printerr(0, "WARNING: %s while destroying credential "
+                                   "cache '%s'\n", k5err, ple->ccname);
+-                      krb5_free_string(context, k5err);
++                      free(k5err);
+                       k5err = NULL;
+               }
+       }
+       krb5_free_context(context);
+   out:
+-      krb5_free_string(context, k5err);
++      free(k5err);
+ }
+ 
+ /*
+@@ -1347,7 +1383,7 @@
+ out_free_context:
+       krb5_free_context(context);
+ out:
+-      krb5_free_string(context, k5err);
++      free(k5err);
+       return retval;
+ }
+ 
+@@ -1369,7 +1405,7 @@
  #endif
        if (msg != NULL)
                return msg;