sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r11922: Looks bigger than it is: There's no point in allocating arrays in

Browse Source 
samr_lookup_rids twice. It was done in the srv_samr_nt.c code as well as in
the pdb module. Remove the latter, this might happen more often.

Volker
This commit is contained in:
Volker Lendecke 2005-11-26 22:04:28 +00:00 committed by Gerald (Jerry) Carter
parent 049920ce4f
commit 57f0cf8cdd
4 changed files with 30 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/include/passdb.h
View File

@ -367,12 +367,11 @@ typedef struct pdb_context
size_t *p_num_alias_rids);
NTSTATUS (*pdb_lookup_rids)(struct pdb_context *context,
TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
size_t num_rids,
uint32 *rids,
const char ***pp_names,
uint32 **attrs);
const char **pp_names,
uint32 *attrs);
NTSTATUS (*pdb_get_account_policy)(struct pdb_context *context,
int policy_index, uint32 *value);
@ -491,12 +490,11 @@ typedef struct pdb_methods
size_t *p_num_alias_rids);
NTSTATUS (*lookup_rids)(struct pdb_methods *methods,
TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
int num_rids,
uint32 *rids,
const char ***pp_names,
uint32 **attrs);
const char **pp_names,
uint32 *attrs);
NTSTATUS (*get_account_policy)(struct pdb_methods *methods,
int policy_index, uint32 *value);

38
source/passdb/pdb_interface.c
View File

@ -681,12 +681,11 @@ static NTSTATUS context_enum_alias_memberships(struct pdb_context *context,
}
static NTSTATUS context_lookup_rids(struct pdb_context *context,
TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
size_t num_rids,
uint32 *rids,
const char ***pp_names,
uint32 **pp_attrs)
const char **pp_names,
uint32 *pp_attrs)
{
NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
@ -696,7 +695,7 @@ static NTSTATUS context_lookup_rids(struct pdb_context *context,
}
return context->pdb_methods->lookup_rids(context->pdb_methods,
mem_ctx, domain_sid, num_rids,
domain_sid, num_rids,
rids, pp_names, pp_attrs);
}
@ -1398,12 +1397,11 @@ BOOL pdb_enum_alias_memberships(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
p_num_alias_rids));
}
NTSTATUS pdb_lookup_rids(TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
NTSTATUS pdb_lookup_rids(const DOM_SID *domain_sid,
int num_rids,
uint32 *rids,
const char ***names,
uint32 **attrs)
const char **names,
uint32 *attrs)
{
struct pdb_context *pdb_context = pdb_get_static_context(False);
@ -1411,7 +1409,7 @@ NTSTATUS pdb_lookup_rids(TALLOC_CTX *mem_ctx,
return NT_STATUS_NOT_IMPLEMENTED;
}
return pdb_context->pdb_lookup_rids(pdb_context, mem_ctx, domain_sid,
return pdb_context->pdb_lookup_rids(pdb_context, domain_sid,
num_rids, rids, names, attrs);
}
@ -1643,24 +1641,17 @@ NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods,
}
NTSTATUS pdb_default_lookup_rids(struct pdb_methods *methods,
TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
int num_rids,
uint32 *rids,
const char ***names,
uint32 **attrs)
const char **names,
uint32 *attrs)
{
int i;
NTSTATUS result;
BOOL have_mapped = False;
BOOL have_unmapped = False;
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, const char *, num_rids);
(*attrs) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_rids);
if ((num_rids != 0) && (((*names) == NULL) || ((*attrs) == NULL)))
return NT_STATUS_NO_MEMORY;
if (!sid_equal(domain_sid, get_global_sam_sid())) {
/* TODO: Sooner or later we need to look up BUILTIN rids as
* well. -- vl */
@ -1673,18 +1664,17 @@ NTSTATUS pdb_default_lookup_rids(struct pdb_methods *methods,
DOM_SID sid;
enum SID_NAME_USE type;
(*attrs)[i] = SID_NAME_UNKNOWN;
attrs[i] = SID_NAME_UNKNOWN;
sid_copy(&sid, domain_sid);
sid_append_rid(&sid, rids[i]);
if (lookup_sid(&sid, domname, tmpname, &type)) {
(*attrs)[i] = (uint32)type;
(*names)[i] = talloc_strdup(mem_ctx, tmpname);
if ((*names)[i] == NULL)
attrs[i] = (uint32)type;
names[i] = talloc_strdup(names, tmpname);
if (names[i] == NULL)
return NT_STATUS_NO_MEMORY;
DEBUG(5,("lookup_rids: %s:%d\n", (*names)[i],
(*attrs)[i]));
DEBUG(5,("lookup_rids: %s:%d\n", names[i], attrs[i]));
have_mapped = True;
} else {
have_unmapped = True;

27
source/passdb/pdb_ldap.c
View File

@ -3514,12 +3514,11 @@ static NTSTATUS ldapsam_get_account_policy(struct pdb_methods *methods, int poli
}
static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
int num_rids,
uint32 *rids,
const char ***names,
uint32 **attrs)
const char **names,
uint32 *attrs)
{
struct ldapsam_privates *ldap_state =
(struct ldapsam_privates *)methods->private_data;
@ -3532,7 +3531,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
if (!lp_parm_bool(-1, "ldapsam", "trusted", False))
return pdb_default_lookup_rids(methods, mem_ctx, domain_sid,
return pdb_default_lookup_rids(methods, domain_sid,
num_rids, rids, names, attrs);
if (!sid_equal(domain_sid, get_global_sam_sid())) {
@ -3541,14 +3540,8 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
goto done;
}
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, const char *, num_rids);
(*attrs) = TALLOC_ARRAY(mem_ctx, uint32, num_rids);
if ((num_rids != 0) && (((*names) == NULL) || ((*attrs) == NULL)))
return NT_STATUS_NO_MEMORY;
for (i=0; i<num_rids; i++)
(*attrs)[i] = SID_NAME_UNKNOWN;
attrs[i] = SID_NAME_UNKNOWN;
allsids = SMB_STRDUP("");
if (allsids == NULL) return NT_STATUS_NO_MEMORY;
@ -3618,9 +3611,9 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
continue;
}
(*attrs)[rid_index] = SID_NAME_USER;
(*names)[rid_index] = talloc_strdup(mem_ctx, str);
if ((*names)[rid_index] == NULL) return NT_STATUS_NO_MEMORY;
attrs[rid_index] = SID_NAME_USER;
names[rid_index] = talloc_strdup(names, str);
if (names[rid_index] == NULL) return NT_STATUS_NO_MEMORY;
num_mapped += 1;
}
@ -3683,9 +3676,9 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
continue;
}
(*attrs)[rid_index] = SID_NAME_DOM_GRP;
(*names)[rid_index] = talloc_strdup(mem_ctx, str);
if ((*names)[rid_index] == NULL) return NT_STATUS_NO_MEMORY;
attrs[rid_index] = SID_NAME_DOM_GRP;
names[rid_index] = talloc_strdup(names, str);
if (names[rid_index] == NULL) return NT_STATUS_NO_MEMORY;
num_mapped += 1;
}

4
source/rpc_server/srv_samr_nt.c
View File

@ -1523,8 +1523,8 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK
}
become_root(); /* lookup_sid can require root privs */
r_u->status = pdb_lookup_rids(p->mem_ctx, &pol_sid, num_rids, q_u->rid,
&names, &attrs);
r_u->status = pdb_lookup_rids(&pol_sid, num_rids, q_u->rid,
names, attrs);
unbecome_root();
done: