From c9955da65ad1befe51ad21dd884956c199b4c9b5 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 31 Dec 2016 12:45:51 +0000 Subject: [PATCH] libads: Use "all_zero" where appropriate ... Saves a few bytes of footprint Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme --- source3/libads/kerberos_keytab.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index 8c7c1c36d14..3c73b089bbb 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -553,18 +553,10 @@ done: TALLOC_FREE(frame); if (context) { - krb5_keytab_entry zero_kt_entry; - krb5_kt_cursor zero_csr; - - ZERO_STRUCT(zero_kt_entry); - ZERO_STRUCT(zero_csr); - - if (memcmp(&zero_kt_entry, &kt_entry, - sizeof(krb5_keytab_entry))) { + if (!all_zero((uint8_t *)&kt_entry, sizeof(kt_entry))) { smb_krb5_kt_free_entry(context, &kt_entry); } - if ((memcmp(&cursor, &zero_csr, - sizeof(krb5_kt_cursor)) != 0) && keytab) { + if (!all_zero((uint8_t *)&cursor, sizeof(cursor)) && keytab) { krb5_kt_end_seq_get(context, keytab, &cursor); } if (keytab) { @@ -657,21 +649,11 @@ int ads_keytab_list(const char *keytab_name) ZERO_STRUCT(cursor); out: - { - krb5_keytab_entry zero_kt_entry; - ZERO_STRUCT(zero_kt_entry); - if (memcmp(&zero_kt_entry, &kt_entry, - sizeof(krb5_keytab_entry))) { - smb_krb5_kt_free_entry(context, &kt_entry); - } + if (!all_zero((uint8_t *)&kt_entry, sizeof(kt_entry))) { + smb_krb5_kt_free_entry(context, &kt_entry); } - { - krb5_kt_cursor zero_csr; - ZERO_STRUCT(zero_csr); - if ((memcmp(&cursor, &zero_csr, - sizeof(krb5_kt_cursor)) != 0) && keytab) { - krb5_kt_end_seq_get(context, keytab, &cursor); - } + if (!all_zero((uint8_t *)&cursor, sizeof(cursor)) && keytab) { + krb5_kt_end_seq_get(context, keytab, &cursor); } if (keytab) { -- 2.47.2