diff options
| author | Volker Lendecke <vlendec@samba.org> | 2004-02-16 14:24:35 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2004-02-16 14:24:35 +0000 |
| commit | d2742ac2fc42dc36ae089fd043228b7a41e523aa (patch) | |
| tree | b976204687f45ce25d6e394f60cf53da0a16f006 | |
| parent | f570f879bbcef275d55a29a0d82ec91ddb31d6c9 (diff) | |
| download | samba-d2742ac2fc42dc36ae089fd043228b7a41e523aa.tar.gz samba-d2742ac2fc42dc36ae089fd043228b7a41e523aa.tar.bz2 samba-d2742ac2fc42dc36ae089fd043228b7a41e523aa.zip | |
Cosmetic fix: Use sid_is_in_our_domain instead of doing it per hand.
Volker
(This used to be commit 04639e8862c360e89faac8b80c63197d514b7455)
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index b8de24cf39..3c9adf4129 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -3263,7 +3263,6 @@ NTSTATUS _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_ int final_num_sids = 0; int i; DOM_SID group_sid; - uint32 group_rid; fstring group_sid_str; DOM_SID *sids=NULL; @@ -3282,17 +3281,14 @@ NTSTATUS _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_ return r_u->status; } - /* todo: change to use sid_compare_front */ - - sid_split_rid(&group_sid, &group_rid); sid_to_string(group_sid_str, &group_sid); DEBUG(10, ("sid is %s\n", group_sid_str)); - /* can we get a query for an SID outside our domain ? */ - if (!sid_equal(&group_sid, get_global_sam_sid())) + if (!sid_check_is_in_our_domain(&group_sid)) { + DEBUG(3, ("sid %s is not in our domain\n", group_sid_str)); return NT_STATUS_NO_SUCH_GROUP; + } - sid_append_rid(&group_sid, group_rid); DEBUG(10, ("lookup on Domain SID\n")); if(!get_domain_group_from_sid(group_sid, &map)) |