diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-01-02 01:39:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:35:50 -0500 |
| commit | 811397151b9ef03dd656522342829ecf19f6ba62 (patch) | |
| tree | b7448226f96a2dc50cc547d01b58af7fc21cd4be /source4 | |
| parent | bea88a10285f814415ede4ee1ff1c34a4fd4e000 (diff) | |
| download | samba-811397151b9ef03dd656522342829ecf19f6ba62.tar.gz samba-811397151b9ef03dd656522342829ecf19f6ba62.tar.bz2 samba-811397151b9ef03dd656522342829ecf19f6ba62.zip | |
r20456: Rename variables to avoid shadowing global function names.
Andrew Bartlett
(This used to be commit c353f2bb91d6cf7553325b94baae8986e85e8ee5)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/libnet/libnet_domain.c | 10 | ||||
| -rw-r--r-- | source4/torture/libnet/libnet_share.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c index 8bf175212e..86dfe97ced 100644 --- 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 07505adebb..d60a9c538f 100644 --- 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; |