svn commit: samba r4374 - in
branches/SAMBA_4_0/source/rpc_server/samr: .
vlendec at samba.org
vlendec at samba.org
Mon Dec 27 09:48:49 GMT 2004
Author: vlendec
Date: 2004-12-27 09:48:49 +0000 (Mon, 27 Dec 2004)
New Revision: 4374
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4374
Log:
Follow metzes hint, change LookupRids a bit
Modified:
branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2004-12-27 00:32:13 UTC (rev 4373)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2004-12-27 09:48:49 UTC (rev 4374)
@@ -1069,6 +1069,8 @@
struct samr_domain_state *d_state;
int i;
NTSTATUS status = NT_STATUS_OK;
+ struct samr_String *names;
+ uint32_t *ids;
ZERO_STRUCT(r->out.names);
ZERO_STRUCT(r->out.types);
@@ -1080,31 +1082,21 @@
if (r->in.num_rids == 0)
return NT_STATUS_OK;
- r->out.names.names = talloc_array_p(mem_ctx, struct samr_String,
- r->in.num_rids);
- if (r->out.names.names == NULL)
- return NT_STATUS_NO_MEMORY;
+ names = talloc_array_p(mem_ctx, struct samr_String, r->in.num_rids);
+ ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_rids);
- r->out.types.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_rids);
- if (r->out.types.ids == NULL)
+ if ((names == NULL) || (ids == NULL))
return NT_STATUS_NO_MEMORY;
- r->out.names.count = r->in.num_rids;
- r->out.types.count = r->in.num_rids;
-
for (i=0; i<r->in.num_rids; i++) {
struct ldb_message **res;
int count;
const char * const attrs[] = { "sAMAccountType",
"sAMAccountName", NULL };
- struct samr_String *str;
uint32_t atype;
- str = &r->out.names.names[i];
+ ids[i] = SID_NAME_UNKNOWN;
- ZERO_STRUCTP(str);
- r->out.types.ids[i] = 0;
-
count = samdb_search(d_state->sam_ctx, mem_ctx,
d_state->domain_dn, &res, attrs,
"(objectSid=%s-%u)", d_state->domain_sid,
@@ -1114,8 +1106,8 @@
continue;
}
- str->string = samdb_result_string(res[0], "sAMAccountName",
- NULL);
+ names[i].string = samdb_result_string(res[0], "sAMAccountName",
+ NULL);
atype = samdb_result_uint(res[0], "sAMAccountType", 0);
if (atype == 0) {
@@ -1123,14 +1115,20 @@
continue;
}
- r->out.types.ids[i] = samdb_atype_map(atype);
+ ids[i] = samdb_atype_map(atype);
- if (r->out.types.ids[i] == SID_NAME_UNKNOWN) {
+ if (ids[i] == SID_NAME_UNKNOWN) {
status = STATUS_SOME_UNMAPPED;
continue;
}
}
-
+
+ r->out.names.names = names;
+ r->out.names.count = r->in.num_rids;
+
+ r->out.types.ids = ids;
+ r->out.types.count = r->in.num_rids;
+
return status;
}
More information about the samba-cvs
mailing list