diff options
| author | Tim Potter <tpot@samba.org> | 2005-02-13 00:26:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:46 -0500 |
| commit | abc28d66e9c472300271cb250313b3e8d0293abd (patch) | |
| tree | 07f25928c52cbb68d4484d1e68bfac6e473be538 /source4/rpc_server/samr | |
| parent | 2f8478b27d4929d5f7ea8f92f61df57dd869ede6 (diff) | |
| download | samba-abc28d66e9c472300271cb250313b3e8d0293abd.tar.gz samba-abc28d66e9c472300271cb250313b3e8d0293abd.tar.bz2 samba-abc28d66e9c472300271cb250313b3e8d0293abd.zip | |
r5364: Rename string fields called 'domain' and 'name' to be 'domain_name'.
(This used to be commit 6749b9404d4e9876ecd964e038c608f05d2c0b69)
Diffstat (limited to 'source4/rpc_server/samr')
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index d498d951d5..518ad02f4c 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -169,14 +169,14 @@ static NTSTATUS samr_LookupDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX c_state = h->data; - if (r->in.domain->string == NULL) { + if (r->in.domain_name->string == NULL) { return NT_STATUS_INVALID_PARAMETER; } sidstr = samdb_search_string(c_state->sam_ctx, mem_ctx, NULL, "objectSid", "(&(name=%s)(objectclass=domain))", - r->in.domain->string); + r->in.domain_name->string); if (sidstr == NULL) { return NT_STATUS_NO_SUCH_DOMAIN; } @@ -184,7 +184,7 @@ static NTSTATUS samr_LookupDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX sid = dom_sid_parse_talloc(mem_ctx, sidstr); if (sid == NULL) { DEBUG(0,("samdb: Invalid sid '%s' for domain %s\n", - sidstr, r->in.domain->string)); + sidstr, r->in.domain_name->string)); return NT_STATUS_INTERNAL_DB_CORRUPTION; } @@ -383,7 +383,7 @@ static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX * info->force_logoff_time = 0x8000000000000000LL; info->comment.string = samdb_result_string(res[0], "comment", NULL); - info->domain.string = samdb_result_string(res[0], "name", NULL); + info->domain_name.string = samdb_result_string(res[0], "name", NULL); info->primary.string = lp_netbios_name(); info->sequence_num = 0; |