Attachment 1700 Details for Bug 3421 – Patch I checked in.

[patch] Patch I checked in.

look (text/plain), 1.44 KB, created by Jeremy Allison on 2006-01-18 12:21:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2006-01-18 12:21:22 UTC

Size: 1.44 KB

patch

obsolete

>Index: libsmb/clikrb5.c
>===================================================================
>--- libsmb/clikrb5.c	(revision 13010)
>+++ libsmb/clikrb5.c	(working copy)
>@@ -770,7 +770,6 @@
> 
> static krb5_error_code
> get_key_from_keytab(krb5_context context,
>-		    krb5_keytab keytab,
> 		    krb5_const_principal server,
> 		    krb5_enctype enctype,
> 		    krb5_kvno kvno,
>@@ -778,13 +777,18 @@
> {
> 	krb5_keytab_entry entry;
> 	krb5_error_code ret;
>-	krb5_keytab real_keytab;
>+	krb5_keytab keytab;
> 	char *name = NULL;
> 
>-	if (keytab == NULL) {
>-		krb5_kt_default(context, &real_keytab);
>-	} else {
>-		real_keytab = keytab;
>+	/* We have to open a new keytab handle here, as MIT does
>+	   an implicit open/getnext/close on krb5_kt_get_entry. We
>+	   may be in the middle of a keytab enumeration when this is
>+	   called. JRA. */
>+
>+	ret = krb5_kt_default(context, &keytab);
>+	if (ret) {
>+		DEBUG(0,("get_key_from_keytab: failed to open keytab: %s\n", error_message(ret)));
>+		return ret;
> 	}
> 
> 	if ( DEBUGLEVEL >= 10 ) {
>@@ -795,7 +799,7 @@
> 	}
> 
> 	ret = krb5_kt_get_entry(context,
>-				real_keytab,
>+				keytab,
> 				server,
> 				kvno,
> 				enctype,
>@@ -822,10 +826,7 @@
> 	smb_krb5_kt_free_entry(context, &entry);
> 	
> out:    
>-	if (keytab == NULL) {
>-		krb5_kt_close(context, real_keytab);
>-	}
>-		
>+	krb5_kt_close(context, keytab);
> 	return ret;
> }
> 
>@@ -916,7 +917,6 @@
> 	}
> 
> 	ret = get_key_from_keytab(context, 
>-				  keytab,
> 				  server,
> 				  enctype,
> 				  kvno,

Actions: View

Attachments on bug 3421: 1698 | 1700