svn commit: samba r2474 - branches/SAMBA_3_0/source/libsmb trunk/source/libsmb

[gd at samba.org]

Author: gd
Date: 2004-09-21 12:50:04 +0000 (Tue, 21 Sep 2004)
New Revision: 2474

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=2474&nolog=1

Log:
(re-)fix memleak (initially found by jra).

heimdal 0.6.1rc3 had a bug causing winbindd to die, heimdal version
0.6.1 and higher have that fixed (thanks to Love from Heimdal).

SuSE has been informed about this possible pitfall, any other vendors
that ship with heimdal-0.6.1rc3 to be notified ?

Guenther


Modified:
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   trunk/source/libsmb/clikrb5.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c	2004-09-21 11:50:42 UTC (rev 2473)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c	2004-09-21 12:50:04 UTC (rev 2474)
@@ -430,14 +430,8 @@
 failed:
 
 	if ( context ) {
-/* Removed by jra. They really need to fix their kerberos so we don't leak memory. 
- JERRY -- disabled since it causes heimdal 0.6.1rc3 to die
-          SuSE 9.1 Pro 
-*/
 		if (ccdef)
-#if 0 /* redisabled by gd :) at least until any official heimdal version has it fixed. */
 			krb5_cc_close(context, ccdef);
-#endif
 		if (auth_context)
 			krb5_auth_con_free(context, auth_context);
 		krb5_free_context(context);

Modified: trunk/source/libsmb/clikrb5.c
===================================================================
--- trunk/source/libsmb/clikrb5.c	2004-09-21 11:50:42 UTC (rev 2473)
+++ trunk/source/libsmb/clikrb5.c	2004-09-21 12:50:04 UTC (rev 2474)
@@ -423,11 +423,8 @@
 failed:
 
 	if ( context ) {
-#if 0 	/* JERRY -- disabled since it causes heimdal 0.6.1rc3 to die 
-	   SuSE 9.1 Pro */
 		if (ccdef)
 			krb5_cc_close(context, ccdef);
-#endif
 		if (auth_context)
 			krb5_auth_con_free(context, auth_context);
 		krb5_free_context(context);