cifs-utils-heimdal.patch

   1 --- cifs-utils-5.5/cifs.upcall.c.orig   2012-05-30 12:12:16.000000000 +0200
   2 +++ cifs-utils-5.5/cifs.upcall.c        2012-06-24 20:47:02.372423189 +0200
   3 @@ -76,7 +76,7 @@
   4   *
   5   */
   6
   7 -static char *cifs_krb5_principal_get_realm(krb5_context context __attribute__ ((unused)),
   8 +static const char *cifs_krb5_principal_get_realm(krb5_context context __attribute__ ((unused)),
   9                                            krb5_principal principal)
  10  {
  11  #ifdef HAVE_KRB5_PRINCIPAL_GET_REALM   /* Heimdal */
  12 @@ -84,7 +84,7 @@
  13  #elif defined(krb5_princ_realm)        /* MIT */
  14         krb5_data *realm;
  15         realm = krb5_princ_realm(context, principal);
  16 -       return (char *)realm->data;
  17 +       return (const char *)realm->data;
  18  #else
  19         return NULL;
  20  #endif
  21 @@ -116,7 +116,7 @@
  22         krb5_creds creds;
  23         krb5_principal principal;
  24         time_t credtime = 0;
  25 -       char *realm = NULL;
  26 +       const char *realm = NULL;
  27
  28         if (krb5_init_context(&context)) {
  29                 syslog(LOG_DEBUG, "%s: unable to init krb5 context", __func__);
  30 @@ -162,7 +162,7 @@
  31                     && creds.times.endtime > time(NULL))
  32                         credtime = creds.times.endtime;
  33                 krb5_free_cred_contents(context, &creds);
  34 -               krb5_free_unparsed_name(context, name);
  35 +               krb5_xfree(name);
  36         }
  37  err_endseq:
  38         krb5_cc_end_seq_get(context, ccache, &cur);