r20456: Rename variables to avoid shadowing global function names.

Andrew Bartlett
(This used to be commit c353f2bb91d6cf7553325b94baae8986e85e8ee5)

diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 8bf175212ee4b1525eb56487da46bdae988f97f8..86dfe97ced4a701bbe2621c70f076e67acf7b53f 100644 (file)
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -128,7 +128,7 @@ BOOL torture_domain_open_lsa(struct torture_context *torture)
        BOOL ret = True;
        struct libnet_context *ctx;
        struct libnet_DomainOpen r;
-       struct lsa_Close close;
+       struct lsa_Close lsa_close;
        struct dcerpc_binding *binding;
        struct policy_handle h;
        const char *bindstr;
@@ -160,11 +160,11 @@ BOOL torture_domain_open_lsa(struct torture_context *torture)
                goto done;
        }
 
-       ZERO_STRUCT(close);
-       close.in.handle  = &ctx->lsa.handle;
-       close.out.handle = &h;
+       ZERO_STRUCT(lsa_close);
+       lsa_close.in.handle  = &ctx->lsa.handle;
+       lsa_close.out.handle = &h;
        
-       status = dcerpc_lsa_Close(ctx->lsa.pipe, ctx, &close);
+       status = dcerpc_lsa_Close(ctx->lsa.pipe, ctx, &lsa_close);
        if (!NT_STATUS_IS_OK(status)) {
                d_printf("failed to close domain on lsa service: %s\n", nt_errstr(status));
                ret = False;

diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index 07505adebb8c5e91dbb94c60f2d1c6c865155164..d60a9c538fc754d18b881fdb7963144ce2db22df 100644 (file)
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -169,7 +169,7 @@ done:
 }
 
 
-static BOOL test_addshare(struct dcerpc_pipe *pipe, TALLOC_CTX *mem_ctx, const char *host,
+static BOOL test_addshare(struct dcerpc_pipe *svc_pipe, TALLOC_CTX *mem_ctx, const char *host,
                          const char* share)
 {
        NTSTATUS status;
@@ -188,7 +188,7 @@ static BOOL test_addshare(struct dcerpc_pipe *pipe, TALLOC_CTX *mem_ctx, const c
        add.in.level      = 2;
        add.in.info.info2 = &i;
 
-       status = dcerpc_srvsvc_NetShareAdd(pipe, mem_ctx, &add);
+       status = dcerpc_srvsvc_NetShareAdd(svc_pipe, mem_ctx, &add);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Failed to add a new share\n");
                return False;