From fd406528b79a2fe4aefe0e04495cdaebe381e3d1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 1 Dec 2019 16:21:12 +0100 Subject: [PATCH] dsdb: Align integer types Signed-off-by: Volker Lendecke Reviewed-by: David Disseldorp --- source4/dsdb/samdb/ldb_modules/encrypted_secrets.c | 13 ++++++------- .../dsdb/samdb/ldb_modules/tests/test_encrypted_secrets.c | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c b/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c index 7e6d4b160d4..d3ce7e31642 100644 --- a/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c +++ b/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c @@ -263,7 +263,7 @@ static int load_keys(struct ldb_module *module, struct es_data *data) */ static bool should_encrypt(const struct ldb_message_element *el) { - int i; + size_t i; for (i = 0; i < ARRAY_SIZE(secret_attributes); i++) { if (strcasecmp(secret_attributes[i], el->name) == 0) { @@ -748,7 +748,7 @@ static struct ldb_message_element *encrypt_element( const struct es_data *data) { struct ldb_message_element* enc; - int i; + unsigned int i; enc = talloc_zero(ctx, struct ldb_message_element); if (enc == NULL) { @@ -818,10 +818,9 @@ static const struct ldb_message *encrypt_secret_attributes( const struct ldb_message *msg, const struct es_data *data) { - struct ldb_message *encrypted_msg = NULL; - int i; + unsigned int i; if (ldb_dn_is_special(msg->dn)) { return NULL; @@ -1003,7 +1002,7 @@ static struct ldb_message_element *decrypt_element( struct ldb_message_element* el, struct es_data *data) { - int i; + unsigned int i; struct ldb_message_element* dec = talloc_zero(ctx, struct ldb_message_element); @@ -1069,8 +1068,8 @@ static int decrypt_secret_attributes(struct ldb_context *ldb, struct ldb_message *msg, struct es_data *data) { - - int i, ret; + size_t i; + int ret; if (ldb_dn_is_special(msg->dn)) { return LDB_SUCCESS; diff --git a/source4/dsdb/samdb/ldb_modules/tests/test_encrypted_secrets.c b/source4/dsdb/samdb/ldb_modules/tests/test_encrypted_secrets.c index 6357deab7ce..e639d4cbb0a 100644 --- a/source4/dsdb/samdb/ldb_modules/tests/test_encrypted_secrets.c +++ b/source4/dsdb/samdb/ldb_modules/tests/test_encrypted_secrets.c @@ -672,7 +672,8 @@ static void test_message_encryption_decryption(void **state) struct es_data); struct ldb_message_element *el = NULL; int ret = LDB_SUCCESS; - int i, j; + size_t i; + unsigned int j; msg->dn = ldb_dn_new(msg, ldb, "dc=test"); ldb_msg_add_string(msg, "cmocka_test_name01", "value01"); -- 2.11.4.GIT