Bug#391276: pam-krb5-2.3 and Hiemdal

[Douglas E. Engert]

Package: libpam-krb5
Version: 2.3


Russ, Sam,
Down loaded pam-krb5-2.3 from ftp://ftp.eyrie.org/pub/software/kerberos
to test with Heimdal snapshot 20061002 on Ubuntu Edgy. I built from your
source not the debian source.

I had to make the following changes to get it run and work with gdm
and gdm-screensaver.

 compat_heimdal.c

 o added  #include <errno.h>
 o pamk5_compat_store_realm renamed to pamk5_compat_set_realm
 o added return 0;
 o The Heimdal prompter has the name prameter. According to
   the ChangeLog2001 this was done in 2001-05-11

context.c

 o The use of the MIT error_message was replaced with the
   compat version.



--

 Douglas E. Engert  <[EMAIL PROTECTED]>
 Argonne National Laboratory
 9700 South Cass Avenue
 Argonne, Illinois  60439
 (630) 252-5444

--- ./,compat_heimdal.c Sun Sep  3 21:31:47 2006
+++ ./compat_heimdal.c  Thu Oct  5 09:10:17 2006
@@ -6,6 +6,7 @@
 
 #include "config.h"
 
+#include <errno.h>
 #include <krb5.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,12 +28,13 @@
 
 
 krb5_error_code
-pamk5_compat_store_realm(struct pam_args *args, const char *realm)
+pamk5_compat_set_realm(struct pam_args *args, const char *realm)
 {
     pamk5_compat_free_realm(args);
     args->realm_data = strdup(realm);
     if (args->realm_data == NULL)
         return errno;
+       return 0;
 }
 
 
@@ -47,10 +49,10 @@
 
 
 static krb5_error_code
-heimdal_pam_prompter(krb5_context c, void *data, const char *banner,
+heimdal_pam_prompter(krb5_context c, void *data, const char *name, const char 
*banner,
                      int num_prompts, krb5_prompt prompts[])
 {
-    return pamk5_prompter_krb5(c, data, NULL, banner, num_prompts, prompts);
+    return pamk5_prompter_krb5(c, data, name, banner, num_prompts, prompts);
 }
 
 krb5_prompter_fct pamk5_pam_prompter = heimdal_pam_prompter;
--- ./,context.c        Sun Sep  3 21:31:47 2006
+++ ./context.c Thu Oct  5 09:02:16 2006
@@ -59,7 +59,7 @@
         c->service = "unknown";
     retval = krb5_init_context(&c->context);
     if (retval != 0) {
-        pamk5_error(c, "krb5_init_context: %s", error_message(retval));
+        pamk5_error(c, "krb5_init_context: %s", 
pamk5_compat_get_err_text(c->context,retval));
         retval = PAM_SERVICE_ERR;
         goto done;
     }