diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 01fb1dd4df6..38cd30c47dc 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -5755,7 +5755,7 @@ int dsdb_search(struct ldb_context *ldb,
 		 * • whenCreated
 		 */
 
-		ret = dsdb_update_gmsa_keys(ldb, tmp_ctx, res, &retry);
+		ret = dsdb_update_gmsa_keys(tmp_ctx, ldb, res, &retry);
 		if (ret) {
 			talloc_free(tmp_ctx);
 			return ret;
diff --git a/source4/dsdb/gmsa/util.c b/source4/dsdb/gmsa/util.c
index b0a0691ae1c..bda64bdc77a 100644
--- a/source4/dsdb/gmsa/util.c
+++ b/source4/dsdb/gmsa/util.c
@@ -1529,8 +1529,8 @@ static bool dsdb_data_blobs_equal(const DATA_BLOB *d1, const DATA_BLOB *d2)
 	}
 }
 
-int dsdb_update_gmsa_entry_keys(struct ldb_context *ldb,
-				TALLOC_CTX *mem_ctx,
+int dsdb_update_gmsa_entry_keys(TALLOC_CTX *mem_ctx,
+				struct ldb_context *ldb,
 				const struct gmsa_update *gmsa_update)
 {
 	TALLOC_CTX *tmp_ctx = NULL;
@@ -1650,8 +1650,8 @@ out:
 	return ret;
 }
 
-int dsdb_update_gmsa_keys(struct ldb_context *ldb,
-			  TALLOC_CTX *mem_ctx,
+int dsdb_update_gmsa_keys(TALLOC_CTX *mem_ctx,
+			  struct ldb_context *ldb,
 			  const struct ldb_result *res,
 			  bool *retry_out)
 {
@@ -1750,7 +1750,9 @@ int dsdb_update_gmsa_keys(struct ldb_context *ldb,
 			continue;
 		}
 
-		ret = dsdb_update_gmsa_entry_keys(ldb, tmp_ctx, gmsa_update);
+		ret = dsdb_update_gmsa_entry_keys(tmp_ctx,
+						  ldb,
+						  gmsa_update);
 		if (ret) {
 			goto out;
 		}
diff --git a/source4/dsdb/gmsa/util.h b/source4/dsdb/gmsa/util.h
index 0db77a521d4..f97841c2573 100644
--- a/source4/dsdb/gmsa/util.h
+++ b/source4/dsdb/gmsa/util.h
@@ -118,12 +118,12 @@ int gmsa_recalculate_managed_pwd(TALLOC_CTX *mem_ctx,
 				 struct gmsa_update **update_out,
 				 struct gmsa_return_pwd *return_out);
 
-int dsdb_update_gmsa_entry_keys(struct ldb_context *ldb,
-				TALLOC_CTX *mem_ctx,
+int dsdb_update_gmsa_entry_keys(TALLOC_CTX *mem_ctx,
+				struct ldb_context *ldb,
 				const struct gmsa_update *gmsa_update);
 
-int dsdb_update_gmsa_keys(struct ldb_context *ldb,
-			  TALLOC_CTX *mem_ctx,
+int dsdb_update_gmsa_keys(TALLOC_CTX *mem_ctx,
+			  struct ldb_context *ldb,
 			  const struct ldb_result *res,
 			  bool *retry_out);
 
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index cb033e823b4..3aa7ac38212 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -956,8 +956,9 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
 		for (n = 0; n < len; ++n) {
 			int ret;
 
-			ret = dsdb_update_gmsa_entry_keys(
-				samdb, local_ctx, callback_ctx->updates[n]);
+			ret = dsdb_update_gmsa_entry_keys(local_ctx,
+							  samdb,
+							  callback_ctx->updates[n]);
 			if (ret) {
 				/* Ignore the error. */
 				DBG_WARNING("Failed to update keys for Group "