From cbe9f879afc7b212c1e105fcb54b4563d5f6dfe0 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 19 Aug 2010 07:35:01 -0400 Subject: [PATCH] s3-ads: Fix wrong test in if statement --- source3/include/krb5_protos.h | 2 ++ source3/libads/kerberos_keytab.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h index e229a144121..7ac0f3ec7e8 100644 --- a/source3/include/krb5_protos.h +++ b/source3/include/krb5_protos.h @@ -137,6 +137,8 @@ krb5_error_code smb_krb5_get_creds(const char *server_s, krb5_creds **creds_p); char *smb_krb5_principal_get_realm(krb5_context context, krb5_principal principal); + + #endif /* HAVE_KRB5 */ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx, diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index 10c7087c968..94698c6cc29 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -56,7 +56,7 @@ static krb5_error_code seek_and_delete_old_entries(krb5_context context, ZERO_STRUCT(zero_kt_entry); ret = krb5_kt_start_seq_get(context, keytab, &cursor); - if (ret == KRB5_KT_END && ret == ENOENT ) { + if (ret == KRB5_KT_END || ret == ENOENT ) { /* no entries */ return 0; } -- 2.11.4.GIT