diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-11-22 11:59:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:04 -0500 |
| commit | b6b61cec790e19862a600b023327d72dd33b3cb4 (patch) | |
| tree | 93b1cad84ea4092692da82841d8218aa3fc16928 /source4/rpc_server | |
| parent | ca751e2638ca0fbb03b54e1aaa4ed1316e903947 (diff) | |
| download | samba-b6b61cec790e19862a600b023327d72dd33b3cb4.tar.gz samba-b6b61cec790e19862a600b023327d72dd33b3cb4.tar.bz2 samba-b6b61cec790e19862a600b023327d72dd33b3cb4.zip | |
r3907: * Rename lsa_Name to lsa_String
* Add new IDL to LSA, to query information about trusted domains (for
cross-check with SamSync).
Andrew Bartlett
(This used to be commit 174c0778421b5154ff2ba809688ea6ef38a1478b)
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/lsa/dcesrv_lsa.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 1c3e8d374a..845e568619 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -228,8 +228,8 @@ static NTSTATUS lsa_info_AccountDomain(struct lsa_policy_state *state, TALLOC_CT return NT_STATUS_INTERNAL_DB_CORRUPTION; } - info->name.name = samdb_result_string(res[0], "name", NULL); - info->sid = samdb_result_dom_sid(mem_ctx, res[0], "objectSid"); + info->name.string = samdb_result_string(res[0], "name", NULL); + info->sid = samdb_result_dom_sid(mem_ctx, res[0], "objectSid"); return NT_STATUS_OK; } @@ -250,11 +250,11 @@ static NTSTATUS lsa_info_DNS(struct lsa_policy_state *state, TALLOC_CTX *mem_ctx return NT_STATUS_INTERNAL_DB_CORRUPTION; } - info->name.name = samdb_result_string(res[0], "name", NULL); - info->dns_domain.name = samdb_result_string(res[0], "dnsDomain", NULL); - info->dns_forest.name = samdb_result_string(res[0], "dnsDomain", NULL); - info->domain_guid = samdb_result_guid(res[0], "objectGUID"); - info->sid = samdb_result_dom_sid(mem_ctx, res[0], "objectSid"); + info->name.string = samdb_result_string(res[0], "name", NULL); + info->dns_domain.string = samdb_result_string(res[0], "dnsDomain", NULL); + info->dns_forest.string = samdb_result_string(res[0], "dnsDomain", NULL); + info->domain_guid = samdb_result_guid(res[0], "objectGUID"); + info->sid = samdb_result_dom_sid(mem_ctx, res[0], "objectSid"); return NT_STATUS_OK; } @@ -436,12 +436,12 @@ static NTSTATUS lsa_LookupSids(struct dcesrv_call_state *dce_call, TALLOC_CTX *m r->out.names->count++; (*r->out.count)++; - r->out.names->names[i].sid_type = SID_NAME_UNKNOWN; - r->out.names->names[i].name.name = sid_str; - r->out.names->names[i].sid_index = 0xFFFFFFFF; + r->out.names->names[i].sid_type = SID_NAME_UNKNOWN; + r->out.names->names[i].name.string = sid_str; + r->out.names->names[i].sid_index = 0xFFFFFFFF; if (sid_str == NULL) { - r->out.names->names[i].name.name = "(SIDERROR)"; + r->out.names->names[i].name.string = "(SIDERROR)"; status = STATUS_SOME_UNMAPPED; continue; } @@ -462,7 +462,7 @@ static NTSTATUS lsa_LookupSids(struct dcesrv_call_state *dce_call, TALLOC_CTX *m /* see if we've already done this authority name */ for (j=0;j<r->out.domains->count;j++) { - if (strcmp(authority_name, r->out.domains->domains[j].name.name) == 0) { + if (strcmp(authority_name, r->out.domains->domains[j].name.string) == 0) { break; } } @@ -474,8 +474,8 @@ static NTSTATUS lsa_LookupSids(struct dcesrv_call_state *dce_call, TALLOC_CTX *m if (r->out.domains == NULL) { return NT_STATUS_NO_MEMORY; } - r->out.domains->domains[j].name.name = authority_name; - r->out.domains->domains[j].sid = authority_sid; + r->out.domains->domains[j].name.string = authority_name; + r->out.domains->domains[j].sid = authority_sid; r->out.domains->count++; } @@ -503,9 +503,9 @@ static NTSTATUS lsa_LookupSids(struct dcesrv_call_state *dce_call, TALLOC_CTX *m continue; } - r->out.names->names[i].sid_type = rtype; - r->out.names->names[i].name.name = name; - r->out.names->names[i].sid_index = 0; + r->out.names->names[i].sid_type = rtype; + r->out.names->names[i].name.string = name; + r->out.names->names[i].sid_index = 0; } return status; |