diff options
| author | Simo Sorce <idra@samba.org> | 2010-02-24 17:10:59 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-02-24 18:35:48 -0500 |
| commit | a7057e69c72f2c42a76cf67ccdb5927023c6aac2 (patch) | |
| tree | d71f102633438294671f74bac4b3850c684be600 /source4/rpc_server | |
| parent | 376fa0d66e61fe8165298b5dc1b49265f666a363 (diff) | |
| download | samba-a7057e69c72f2c42a76cf67ccdb5927023c6aac2.tar.gz samba-a7057e69c72f2c42a76cf67ccdb5927023c6aac2.tar.bz2 samba-a7057e69c72f2c42a76cf67ccdb5927023c6aac2.zip | |
s4:lsa use the correct way to store a domain sid
Converting the sid to a string and then storing a string does not save the sid
in the right format. Causing following retrievals to fail to read back a sid
with samdb_result_dom_sid().
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/lsa/dcesrv_lsa.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 05e0a5a184..6a5a9074b2 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -759,13 +759,13 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dc int ret; NTSTATUS nt_status; enum ndr_err_code ndr_err; - struct ldb_context *sam_ldb; + struct ldb_context *sam_ldb; DCESRV_PULL_HANDLE(policy_handle, r->in.policy_handle, LSA_HANDLE_POLICY); ZERO_STRUCTP(r->out.trustdom_handle); policy_state = policy_handle->data; - sam_ldb = policy_state->sam_ldb; + sam_ldb = policy_state->sam_ldb; nt_status = dcesrv_fetch_session_key(dce_call->conn, &session_key); if (!NT_STATUS_IS_OK(nt_status)) { @@ -951,13 +951,11 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dc samdb_msg_add_string(sam_ldb, mem_ctx, msg, "flatname", netbios_name); if (r->in.info->sid) { - const char *sid_string = dom_sid_string(mem_ctx, r->in.info->sid); - if (!sid_string) { + ret = samdb_msg_add_dom_sid(sam_ldb, mem_ctx, msg, "securityIdentifier", r->in.info->sid); + if (ret != LDB_SUCCESS) { ldb_transaction_cancel(sam_ldb); - return NT_STATUS_NO_MEMORY; + return NT_STATUS_INVALID_PARAMETER; } - - samdb_msg_add_string(sam_ldb, mem_ctx, msg, "securityIdentifier", sid_string); } samdb_msg_add_string(sam_ldb, mem_ctx, msg, "objectClass", "trustedDomain"); |