From c0e31dd4f53226386a3017c0a4f8401fab102851 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 3 Nov 2004 00:29:09 +0000 Subject: r3495: Fix the build (recent kerberos-changes). Guenther (This used to be commit c7eab285d967345510a15e83bce508edb8e06e99) --- source3/libads/kerberos.c | 6 ++++-- source3/libads/kerberos_verify.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/libads') diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 32f5951c9f..a38f3c35b1 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -635,7 +635,7 @@ static void kerberos_derive_salting_principal_direct(krb5_context context, Wrapper function for the above. ************************************************************************/ -void kerberos_derive_salting_principal(char *service_principal) +BOOL kerberos_derive_salting_principal(char *service_principal) { krb5_context context = NULL; krb5_enctype *enctypes = NULL; @@ -646,7 +646,7 @@ void kerberos_derive_salting_principal(char *service_principal) if ((ret = krb5_init_context(&context)) != 0) { DEBUG(1,("kerberos_derive_cifs_salting_principals: krb5_init_context failed. %s\n", error_message(ret))); - return; + return False; } if ((ret = get_kerberos_allowed_etypes(context, &enctypes)) != 0) { DEBUG(1,("kerberos_derive_cifs_salting_principals: get_kerberos_allowed_etypes failed. %s\n", @@ -672,6 +672,8 @@ void kerberos_derive_salting_principal(char *service_principal) if (context) { krb5_free_context(context); } + + return ret ? False : True; } /************************************************************************ diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c index 8524fc5d05..848bd61acc 100644 --- a/source3/libads/kerberos_verify.c +++ b/source3/libads/kerberos_verify.c @@ -231,7 +231,6 @@ NTSTATUS ads_verify_ticket(const char *realm, const DATA_BLOB *ticket, char *host_princ_s = NULL; BOOL got_replay_mutex = False; - fstring myname; BOOL auth_ok = False; ZERO_STRUCT(packet); -- cgit