svn commit: samba r7509 - in branches/SAMBA_4_0/source: auth/kerberos heimdal_build

abartlet at samba.org abartlet at samba.org
Sun Jun 12 11:55:49 GMT 2005


Author: abartlet
Date: 2005-06-12 11:55:48 +0000 (Sun, 12 Jun 2005)
New Revision: 7509

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7509

Log:
With the update to Heimdal 20050612 we no longer need krb5_freelog(),
as krb5_closelog() no longer leaks memory.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
   branches/SAMBA_4_0/source/auth/kerberos/config.m4
   branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
   branches/SAMBA_4_0/source/heimdal_build/config.h


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c	2005-06-12 11:31:57 UTC (rev 7508)
+++ branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c	2005-06-12 11:55:48 UTC (rev 7509)
@@ -491,7 +491,7 @@
 
 	/* Otherwise krb5_free_context will try and close what we have already free()ed */
 	krb5_set_warn_dest(ctx->krb5_context, NULL);
-	krb5_freelog(ctx->krb5_context, ctx->logf);
+	krb5_closelog(ctx->krb5_context, ctx->logf);
 	smb_krb5_context_destory_1(ptr);
 	return 0;
 }

Modified: branches/SAMBA_4_0/source/auth/kerberos/config.m4
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-06-12 11:31:57 UTC (rev 7508)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-06-12 11:55:48 UTC (rev 7509)
@@ -258,7 +258,6 @@
 	AC_CHECK_FUNC_EXT(krb5_get_error_string, $KRB5_LIBS)
 	AC_CHECK_FUNC_EXT(krb5_free_error_string, $KRB5_LIBS)
 	AC_CHECK_FUNC_EXT(krb5_initlog, $KRB5_LIBS)
-	AC_CHECK_FUNC_EXT(krb5_freelog, $KRB5_LIBS)
 	AC_CHECK_FUNC_EXT(krb5_addlog_func, $KRB5_LIBS)
 	AC_CHECK_FUNC_EXT(krb5_set_warn_dest, $KRB5_LIBS)
 

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos.h	2005-06-12 11:31:57 UTC (rev 7508)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos.h	2005-06-12 11:55:48 UTC (rev 7509)
@@ -21,7 +21,7 @@
 
 #if defined(HAVE_KRB5)
 
-#if defined(HAVE_KRB5_INITLOG) && defined(HAVE_KRB5_ADDLOG_FUNC) && defined(HAVE_KRB5_FREELOG) && defined (HAVE_KRB5_SET_WARN_DEST) && defined(HAVE_KRB5_LOG_FACILITY)
+#if defined(HAVE_KRB5_INITLOG) && defined(HAVE_KRB5_ADDLOG_FUNC) && defined (HAVE_KRB5_SET_WARN_DEST) && defined(HAVE_KRB5_LOG_FACILITY)
 #define HAVE_KRB5_LOG_CONTROL
 #else
 #undef HAVE_KRB5_LOG_CONTROL

Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.h	2005-06-12 11:31:57 UTC (rev 7508)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h	2005-06-12 11:55:48 UTC (rev 7509)
@@ -83,8 +83,6 @@
 /* #undef HAVE_KRB5_ENCRYPT_DATA */
 /* Define to 1 if you have the `krb5_enctypes_compatible_keys' function. */
 #define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
-/* Define to 1 if you have the `krb5_freelog' function. */
-#define HAVE_KRB5_FREELOG 1
 /* Define to 1 if you have the `krb5_free_data_contents' function. */
 #define HAVE_KRB5_FREE_DATA_CONTENTS 1
 /* Define to 1 if you have the `krb5_free_error_string' function. */



More information about the samba-cvs mailing list