s4:fix some shadowed declaration warnings on Solaris by renaming the symbols

[ira/wip.git] / source4 / rpc_server / lsa / dcesrv_lsa.c

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index a3c8846376b0019590f5d824e2416336ea6411fc..0854f2528446d1c0df82e131e416ea50c9ccfdc7 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -4051,7 +4051,7 @@ static NTSTATUS make_ft_info(TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS add_collision(struct lsa_ForestTrustCollisionInfo *c_info,
-                             uint32_t index, uint32_t collision_type,
+                             uint32_t idx, uint32_t collision_type,
                              uint32_t conflict_type, const char *tdo_name);
 
 static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,