diff options
| author | Jeremy Allison <jra@samba.org> | 2006-06-29 17:03:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:19:07 -0500 |
| commit | b85c276e95208f16d089402e7c43c8ff3fe39b3f (patch) | |
| tree | 774aa2d0301a58acdd9eaf67519c71fa0bedf427 | |
| parent | 48229b35d701c4cdf4c90994dd4f1506bb3994a7 (diff) | |
| download | samba-b85c276e95208f16d089402e7c43c8ff3fe39b3f.tar.gz samba-b85c276e95208f16d089402e7c43c8ff3fe39b3f.tar.bz2 samba-b85c276e95208f16d089402e7c43c8ff3fe39b3f.zip | |
r16678: Fix bug #3898 reported by jason@ncac.gwu.edu.
Jeremy.
(This used to be commit 5c5ea3152f8dbdfd7717b65e035191ffed3ec548)
| -rw-r--r-- | source3/nsswitch/winbindd_rpc.c | 2 | ||||
| -rw-r--r-- | source3/passdb/lookup_sid.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 16 |
3 files changed, 14 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c index 5473af073d..27feea2f67 100644 --- a/source3/nsswitch/winbindd_rpc.c +++ b/source3/nsswitch/winbindd_rpc.c @@ -294,7 +294,7 @@ NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain, { char **domains; char **names; - uint32 *types; + enum SID_NAME_USE *types; NTSTATUS result; struct rpc_pipe_client *cli; POLICY_HND lsa_policy; diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c index 8a28f75ec8..38ca51eaa8 100644 --- a/source3/passdb/lookup_sid.c +++ b/source3/passdb/lookup_sid.c @@ -357,7 +357,7 @@ static BOOL winbind_lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid, int num_rids, uint32 *rids, const char **domain_name, - const char **names, uint32 *types) + const char **names, enum SID_NAME_USE *types) { /* Unless the winbind interface is upgraded, fall back to ask for * individual sids. I imagine introducing a lookuprids operation that diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 2786a740ff..e045de5639 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -1619,12 +1619,14 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK { const char **names; enum SID_NAME_USE *attrs = NULL; + uint32 *wire_attrs = NULL; UNIHDR *hdr_name = NULL; UNISTR2 *uni_name = NULL; DOM_SID pol_sid; int num_rids = q_u->num_rids1; uint32 acc_granted; - + int i; + r_u->status = NT_STATUS_OK; DEBUG(5,("_samr_lookup_rids: %d\n", __LINE__)); @@ -1640,9 +1642,10 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK } names = TALLOC_ZERO_ARRAY(p->mem_ctx, const char *, num_rids); - attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, uint32, num_rids); + attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, enum SID_NAME_USE, num_rids); + wire_attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, uint32, num_rids); - if ((num_rids != 0) && ((names == NULL) || (attrs == NULL))) + if ((num_rids != 0) && ((names == NULL) || (attrs == NULL) || wire_attrs)) return NT_STATUS_NO_MEMORY; become_root(); /* lookup_sid can require root privs */ @@ -1658,7 +1661,12 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK &hdr_name, &uni_name)) return NT_STATUS_NO_MEMORY; - init_samr_r_lookup_rids(r_u, num_rids, hdr_name, uni_name, attrs); + /* Convert from enum SID_NAME_USE to uint32 for wire format. */ + for (i = 0; i < num_rids; i++) { + wire_attrs[i] = (uint32)attrs[i]; + } + + init_samr_r_lookup_rids(r_u, num_rids, hdr_name, uni_name, wire_attrs); DEBUG(5,("_samr_lookup_rids: %d\n", __LINE__)); |