diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
| commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
| tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source3/rpcclient/cmd_samr.c | |
| parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
| parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
| download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip | |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'source3/rpcclient/cmd_samr.c')
| -rw-r--r-- | source3/rpcclient/cmd_samr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 727c9d1456..24bd55abf3 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -284,18 +284,18 @@ static NTSTATUS get_domain_handle(struct rpc_pipe_client *cli, struct dcerpc_binding_handle *b = cli->binding_handle; NTSTATUS status = NT_STATUS_INVALID_PARAMETER, result; - if (StrCaseCmp(sam, "domain") == 0) { + if (strcasecmp_m(sam, "domain") == 0) { status = dcerpc_samr_OpenDomain(b, mem_ctx, connect_pol, access_mask, _domain_sid, domain_pol, &result); - } else if (StrCaseCmp(sam, "builtin") == 0) { + } else if (strcasecmp_m(sam, "builtin") == 0) { status = dcerpc_samr_OpenDomain(b, mem_ctx, connect_pol, access_mask, - CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin), + discard_const_p(struct dom_sid2, &global_sid_Builtin), domain_pol, &result); } @@ -728,7 +728,7 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli, } if (num_sids) { - sid_array.sids = TALLOC_ZERO_ARRAY(mem_ctx, struct lsa_SidPtr, num_sids); + sid_array.sids = talloc_zero_array(mem_ctx, struct lsa_SidPtr, num_sids); if (sid_array.sids == NULL) return NT_STATUS_NO_MEMORY; } else { @@ -2087,7 +2087,7 @@ static NTSTATUS cmd_samr_lookup_names(struct rpc_pipe_client *cli, num_names = argc - 2; - if ((names = TALLOC_ARRAY(mem_ctx, struct lsa_String, num_names)) == NULL) { + if ((names = talloc_array(mem_ctx, struct lsa_String, num_names)) == NULL) { dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result); dcerpc_samr_Close(b, mem_ctx, &connect_pol, &result); status = NT_STATUS_NO_MEMORY; @@ -2167,7 +2167,7 @@ static NTSTATUS cmd_samr_lookup_rids(struct rpc_pipe_client *cli, num_rids = argc - 2; - if ((rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids)) == NULL) { + if ((rids = talloc_array(mem_ctx, uint32, num_rids)) == NULL) { dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result); dcerpc_samr_Close(b, mem_ctx, &connect_pol, &result); status = NT_STATUS_NO_MEMORY; |