r7509: With the update to Heimdal 20050612 we no longer need krb5_freelog(),

as krb5_closelog() no longer leaks memory.

Andrew Bartlett
(This used to be commit b0bf8a4a5f04b65655f4005b27c80eb098039720)

diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c
index 431c5cde76e81cd7e3d6d041bf6858c313bdfa14..ed075f9633e0b9f11529ea4232a8917287a4159f 100644 (file)
--- a/source4/auth/kerberos/clikrb5.c
+++ b/source4/auth/kerberos/clikrb5.c
@@ -491,7 +491,7 @@ static int smb_krb5_context_destory_2(void *ptr)
 
        /* 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;
 }

diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4
index bbb57bdd47c70a0bbf404f537e397f2f17f54f5d..07d4a7f4574066823ab60e4f29dc8ed823d2b19e 100644 (file)
--- a/source4/auth/kerberos/config.m4
+++ b/source4/auth/kerberos/config.m4
@@ -258,7 +258,6 @@ if test x"$with_krb5_support" != x"no"; then
        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)
 

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 3e5ad4c5020d0c10a4c6dd34e817dd4ba170f1f6..a3aff73c879c84e744eeae324123f859d5f90b0f 100644 (file)
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -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

diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index da20a1936d2f87b2fd8125bffbef5dce50912bb3..acd997c6c6fea11824a6ff21fe6957669eb9abdf 100644 (file)
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -83,8 +83,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 /* #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. */