5 files changed, 15 insertions, 34 deletions

diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
index f5e262d2d63b..d230436637df 100644
--- a/security/pam_krb5/Makefile
+++ b/security/pam_krb5/Makefile
@@ -36,11 +36,11 @@ KRB5_IMPL="heimdal"
 .elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/include/heim_err.h)
 KRB5BASE=${HEIMDAL_HOME}
 KRB5_IMPL=heimdal
-LIB_DEPENDS+=		krb5.15:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=		krb5.16:${PORTSDIR}/security/heimdal
 .elif exists(${LOCALBASE}/include/heim_err.h)
 KRB5BASE=${LOCALBASE}
 KRB5_IMPL=heimdal
-LIB_DEPENDS+=		krb5.15:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=		krb5.16:${PORTSDIR}/security/heimdal
 .elif defined(KRB5_HOME) && exists(${KRB5_HOME}/include/mit-sipb-copyright.h)
 KRB5BASE=${KRB5_HOME}
 KRB5_IMPL=mit
diff --git a/security/pam_krb5/files/patch-ab b/security/pam_krb5/files/patch-ab
index 55b8502c3914..f384620a3699 100644
--- a/security/pam_krb5/files/patch-ab
+++ b/security/pam_krb5/files/patch-ab
@@ -1,6 +1,6 @@
 --- pam_krb5.h.orig	Tue Jan  4 19:08:51 2000
-+++ pam_krb5.h	Wed Jan 24 13:37:28 2001
-@@ -5,7 +5,18 @@
++++ pam_krb5.h	Mon Jun 11 13:24:14 2001
+@@ -5,7 +5,16 @@
   */
  
  int get_user_info(pam_handle_t *, char *, int, char **);
@@ -14,8 +14,6 @@
 +
 +const char	*compat_princ_component(krb5_context, krb5_principal, int);
 +void		 compat_free_data_contents(krb5_context, krb5_data *);
-+krb5_error_code	 compat_cc_next_cred(krb5_context, const krb5_ccache, 
-+				     krb5_cc_cursor *, krb5_creds *);
 +
 +#ifndef ENCTYPE_DES_CBC_MD5
 +#define ENCTYPE_DES_CBC_MD5	ETYPE_DES_CBC_MD5
diff --git a/security/pam_krb5/files/patch-ad b/security/pam_krb5/files/patch-ad
index e753e20043a7..908ea7d649aa 100644
--- a/security/pam_krb5/files/patch-ad
+++ b/security/pam_krb5/files/patch-ad
@@ -1,5 +1,5 @@
 --- pam_krb5_auth.c.orig	Tue Jan  4 19:08:51 2000
-+++ pam_krb5_auth.c	Wed Jan 24 14:08:18 2001
++++ pam_krb5_auth.c	Mon Jun 11 13:22:45 2001
 @@ -7,18 +7,22 @@
  
  static const char rcsid[] = "$Id: pam_krb5_auth.c,v 1.18 2000/01/04 08:44:08 fcusack Exp $";
@@ -293,14 +293,12 @@
  	DLOG("krb5_cc_start_seq_get()", error_message(krbret));
  	(void) krb5_cc_destroy(pam_context, ccache_perm);
  	pamret = PAM_SERVICE_ERR;
-@@ -400,9 +416,10 @@
-     }
+@@ -401,8 +417,9 @@
  
      /* Copy the creds (should be two of them) */
--    while ((krbret = krb5_cc_next_cred(pam_context, ccache_temp,
+     while ((krbret = krb5_cc_next_cred(pam_context, ccache_temp,
 -				       &cursor, &creds) == 0)) {
 -	if (krbret = krb5_cc_store_cred(pam_context, ccache_perm, &creds)) {
-+    while ((krbret = compat_cc_next_cred(pam_context, ccache_temp,
 +	&cursor, &creds) == 0)) {
 +	    if ((krbret = krb5_cc_store_cred(pam_context, ccache_perm, 
 +		&creds)) != 0) {
diff --git a/security/pam_krb5/files/patch-ah b/security/pam_krb5/files/patch-ah
index 933c37ed4ec6..cd7fcaef3b27 100644
--- a/security/pam_krb5/files/patch-ah
+++ b/security/pam_krb5/files/patch-ah
@@ -1,6 +1,6 @@
---- compat_heimdal.c.orig	Wed Jan 24 12:40:26 2001
-+++ compat_heimdal.c	Wed Jan 24 12:50:52 2001
-@@ -0,0 +1,133 @@
+--- compat_heimdal.c.orig	Mon Jun 11 13:29:54 2001
++++ compat_heimdal.c	Mon Jun 11 13:32:00 2001
+@@ -0,0 +1,125 @@
 +#include <errno.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -23,17 +23,9 @@
 +	krb5_xfree(data->data);
 +}
 +
-+krb5_error_code
-+compat_cc_next_cred(krb5_context context, const krb5_ccache id, 
-+    krb5_cc_cursor *cursor, krb5_creds *creds)
-+{
-+	return krb5_cc_next_cred(context, id, creds, cursor);
-+}
-+
-+
 +static krb5_error_code
-+heimdal_pam_prompter(krb5_context context, void *data, const char *banner, int 
-+  num_prompts, krb5_prompt prompts[])
++heimdal_pam_prompter(krb5_context context, void *data, const char *name,
++    const char *banner, int num_prompts, krb5_prompt prompts[])
 +{
 +    int		pam_prompts = num_prompts;
 +    int		pamret, i;
diff --git a/security/pam_krb5/files/patch-ai b/security/pam_krb5/files/patch-ai
index 879febd2c8f3..fab81814e912 100644
--- a/security/pam_krb5/files/patch-ai
+++ b/security/pam_krb5/files/patch-ai
@@ -1,6 +1,6 @@
---- compat_mit.c.orig	Mon Nov  6 13:48:30 2000
-+++ compat_mit.c	Mon Nov  6 13:52:48 2000
-@@ -0,0 +1,147 @@
+--- compat_mit.c.orig	Mon Jun 11 13:20:39 2001
++++ compat_mit.c	Mon Jun 11 13:22:18 2001
+@@ -0,0 +1,140 @@
 +#include <errno.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -23,13 +23,6 @@
 +	krb5_free_data_contents(context, data);
 +}
 +
-+krb5_error_code
-+compat_cc_next_cred(krb5_context context, const krb5_ccache id, 
-+    krb5_cc_cursor *cursor, krb5_creds *creds)
-+{
-+	return krb5_cc_next_cred(context, id, cursor, creds);
-+}
-+
 +static krb5_error_code
 +mit_pam_prompter(krb5_context context, void *data, const char *name,
 +	     const char *banner, int num_prompts, krb5_prompt prompts[])