heimdal.patch

   1 --- xrdp-v0.6.1/sesman/verify_user_kerberos.c~  2013-11-09 21:11:15.000000000 +0100
   2 +++ xrdp-v0.6.1/sesman/verify_user_kerberos.c   2013-12-07 19:01:56.670626777 +0100
   3 @@ -187,11 +187,15 @@
   4
   5    u_info = (struct user_info*)data;
   6    rc = 0;
   7 +#ifndef HEIMDAL
   8    types = krb5_get_prompt_types(ctx);
   9 +#endif
  10    for (i = 0; i < num_prompts; i++)
  11    {
  12 +#ifndef HEIMDAL
  13      if (types[i] == KRB5_PROMPT_TYPE_PASSWORD ||
  14          types[i] == KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN)
  15 +#endif
  16      {
  17        g_strncpy(prompts[i].reply->data, u_info->pass, 255);
  18      }
  19 @@ -214,7 +214,11 @@
  20    krb5_creds my_creds;
  21    krb5_error_code code = 0;
  22    krb5_get_init_creds_opt options;
  23 +#ifdef HEIMDAL
  24 +  krb5_addresses* addresses;
  25 +#else
  26    krb5_address** addresses;
  27 +#endif
  28
  29    krb5_get_init_creds_opt_init(&options);
  30    g_memset(&my_creds, 0, sizeof(my_creds));
  31 @@ -245,7 +249,11 @@
  32    if (opts->addresses)
  33    {
  34      addresses = NULL;
  35 +#ifdef HEIMDAL
  36 +    code = krb5_get_all_client_addrs(k5->ctx, addresses);
  37 +#else
  38      code = krb5_os_localaddr(k5->ctx, &addresses);
  39 +#endif
  40      if (code != 0)
  41      {
  42        g_printf("krb5_os_localaddr failed in k5_kinit\n");