From 3b541bdcfe14d30d961a5de20d382af179c381ee Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Wed, 19 Feb 2003 03:19:30 +0000 Subject: Get non-krb systems to compile. How the heck do I keep something from being sucked into proto.h? (This used to be commit 7e84497882df5bf933ab7ae7fe9af3728393202c) --- source3/libsmb/clikrb5.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index c13f663381..2e07dfdb66 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -127,17 +127,18 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context, __ERROR_XX_UNKNOWN_GET_ENCTYPES_FUNCTIONS #endif -#if defined(HAVE_KRB5_FREE_KTYPES) -void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes) + /* the following is defined as krb5_error_code to keep it from + being sucked into proto.h */ +krb5_error_code free_kerberos_etypes(krb5_context context, + krb5_enctype *enctypes) { - return krb5_free_ktypes(context, enctypes); -} +#if defined(HAVE_KRB5_FREE_KTYPES) + krb5_free_ktypes(context, enctypes); #else -void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes) -{ - return free(enctypes); -} + SAFE_FREE(enctypes); #endif + return 0; +} #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, -- cgit