diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-07-21 08:34:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:52 -0500 |
| commit | f3f9e09d6de796d501b81d8af105310adb1023fc (patch) | |
| tree | b3dd6337850c6cd8df9f25dc9bdc504af0d0add3 | |
| parent | 4396d0d1482d4033a469f7a3e3835a6f3b145046 (diff) | |
| download | samba-f3f9e09d6de796d501b81d8af105310adb1023fc.tar.gz samba-f3f9e09d6de796d501b81d8af105310adb1023fc.tar.bz2 samba-f3f9e09d6de796d501b81d8af105310adb1023fc.zip | |
r8670: Remove GUID code from SAMR, it is handled lower down now. I notice
this code also does string SIDs, but I'm not quite sure where that
fits in.
Andrew Bartlett
(This used to be commit 968bcc4fe8142319ca0a2ac9e3a895b5436b4552)
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 5539cdde96..3cda88c04c 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -2025,8 +2025,7 @@ static NTSTATUS samr_AddAliasMember(struct dcesrv_call_state *dce_call, TALLOC_C return NT_STATUS_INTERNAL_DB_CORRUPTION; } else if (ret == 0) { struct ldb_message *msg; - struct GUID guid; - const char *guidstr, *basedn, *sidstr; + const char *basedn, *sidstr; sidstr = dom_sid_string(mem_ctx, r->in.sid); NT_STATUS_HAVE_NO_MEMORY(sidstr); @@ -2052,13 +2051,6 @@ static NTSTATUS samr_AddAliasMember(struct dcesrv_call_state *dce_call, TALLOC_C return NT_STATUS_INTERNAL_DB_CORRUPTION; } - /* a new GUID */ - guid = GUID_random(); - guidstr = GUID_string(mem_ctx, &guid); - if (!guidstr) { - return NT_STATUS_NO_MEMORY; - } - /* TODO: Hmmm. This feels wrong. How do I find the base dn to * put the ForeignSecurityPrincipals? d_state->domain_dn does * not work, this is wrong for the Builtin domain, there's no @@ -2090,8 +2082,6 @@ static NTSTATUS samr_AddAliasMember(struct dcesrv_call_state *dce_call, TALLOC_C "foreignSecurityPrincipal"); samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg, "objectSid", sidstr); - samdb_msg_add_string(d_state->sam_ctx, mem_ctx, msg, - "objectGUID", guidstr); /* create the alias */ ret = samdb_add(d_state->sam_ctx, mem_ctx, msg); |