autofs-eyemzpatched/heimdal.patch

   1 --- autofs-5.0.4/modules/cyrus-sasl.c~  2009-01-11 17:18:55.000000000 +0100
   2 +++ autofs-5.0.4/modules/cyrus-sasl.c   2009-01-11 17:18:55.000000000 +0100
   3 @@ -66,6 +66,15 @@
   4  #endif
   5  #endif
   6
   7 +/**
   8 + * The type of a principal is different for MIT Krb5 and Heimdal.
   9 + * These macros are provided by Heimdal, and introduced here for MIT.
  10 + */
  11 +#ifndef krb5_realm_length
  12 +#define krb5_realm_length(r) ((r).length)
  13 +#define krb5_realm_data(r) ((r).data)
  14 +#endif
  15 +
  16  /*
  17   *  Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
  18   *  environment variable so that the library knows where to find it.
  19 @@ -451,11 +460,11 @@
  20
  21         /* setup a principal for the ticket granting service */
  22         ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
  23 -               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
  24 -               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
  25 +               krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
  26 +               krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
  27                 strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
  28 -               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
  29 -               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
  30 +               krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
  31 +               krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
  32                 0);
  33         if (ret) {
  34                 error(logopt,