summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 13:04:40 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:09:21 +0100
commit4bbfdb2ded3b34fe001757c67d6ca617ea781d2e (patch)
tree8e230a94ba1704204e7400fcbd373accf94bd6a3
parent900a5a6f87d37c1a8cd6bfdc7c24a8d87a83ea48 (diff)
downloadsamba-4bbfdb2ded3b34fe001757c67d6ca617ea781d2e.tar.gz
samba-4bbfdb2ded3b34fe001757c67d6ca617ea781d2e.tar.bz2
samba-4bbfdb2ded3b34fe001757c67d6ca617ea781d2e.zip
s4:torture/rpc: avoid 'delete' and 'class' in samba3rpc.c
metze
-rw-r--r--source4/torture/rpc/samba3rpc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index a1e52ba80e..5b493db813 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1867,7 +1867,7 @@ bool torture_samba3_rpc_getusername(struct torture_context *torture)
d_printf("(%s) whoami on user connection failed\n",
__location__);
ret = false;
- goto delete;
+ goto del;
}
talloc_free(tree);
@@ -1881,7 +1881,7 @@ bool torture_samba3_rpc_getusername(struct torture_context *torture)
ret = false;
}
- delete:
+ del:
if (!delete_user(cli, torture->lp_ctx,
cmdline_credentials,
cli_credentials_get_username(user_creds))) {
@@ -3050,7 +3050,7 @@ static NTSTATUS enumkeys(struct dcerpc_pipe *p, struct policy_handle *handle,
TALLOC_CTX *mem_ctx, int depth)
{
struct winreg_EnumKey r;
- struct winreg_StringBuf class, name;
+ struct winreg_StringBuf kclass, name;
NTSTATUS status;
NTTIME t = 0;
@@ -3058,13 +3058,13 @@ static NTSTATUS enumkeys(struct dcerpc_pipe *p, struct policy_handle *handle,
return NT_STATUS_OK;
}
- class.name = "";
- class.size = 1024;
+ kclass.name = "";
+ kclass.size = 1024;
r.in.handle = handle;
r.in.enum_index = 0;
r.in.name = &name;
- r.in.keyclass = &class;
+ r.in.keyclass = &kclass;
r.out.name = &name;
r.in.last_changed_time = &t;