diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-06-12 11:55:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:02 -0500 |
| commit | e9fa8f7cce55afe8d9a1b38ed3bbd4fd071b6ef4 (patch) | |
| tree | c308cad8786983526f88b280a49723ed7277d80f | |
| parent | 183cb2b939fe20041c71bf197a50415f1c570b31 (diff) | |
| download | samba-e9fa8f7cce55afe8d9a1b38ed3bbd4fd071b6ef4.tar.gz samba-e9fa8f7cce55afe8d9a1b38ed3bbd4fd071b6ef4.tar.bz2 samba-e9fa8f7cce55afe8d9a1b38ed3bbd4fd071b6ef4.zip | |
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)
| -rw-r--r-- | source4/auth/kerberos/clikrb5.c | 2 | ||||
| -rw-r--r-- | source4/auth/kerberos/config.m4 | 1 | ||||
| -rw-r--r-- | source4/auth/kerberos/kerberos.h | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/config.h | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c index 431c5cde76..ed075f9633 100644 --- 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 bbb57bdd47..07d4a7f457 100644 --- 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 3e5ad4c502..a3aff73c87 100644 --- 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 da20a1936d..acd997c6c6 100644 --- 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. */ |