diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-12-02 22:05:56 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-12-02 22:05:56 +0000 |
| commit | 78df0fb8f1ef52b629ccc2634bb0e158a80058a3 (patch) | |
| tree | 1b6fd8660b680d703ae3f344a2b8e0b81b72f0cf /source3/rpc_server/srv_samr.c | |
| parent | 90ce7b9288f23cbf0fe3ce2aecb0b11d283ed531 (diff) | |
| download | samba-78df0fb8f1ef52b629ccc2634bb0e158a80058a3.tar.gz samba-78df0fb8f1ef52b629ccc2634bb0e158a80058a3.tar.bz2 samba-78df0fb8f1ef52b629ccc2634bb0e158a80058a3.zip | |
added rid and sid_name_use to DOMAIN_GRP_MEMBER, for use in group member
query.
domain groups now work, hurrah! only thing is that the description is
one character long, don't know why (which is wierd in itself).
(This used to be commit 78a86c64960a7823b0db8b7bebfffabb4a5ba864)
Diffstat (limited to 'source3/rpc_server/srv_samr.c')
| -rw-r--r-- | source3/rpc_server/srv_samr.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index 505fad25b4..7bc12afe74 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -670,7 +670,6 @@ static void api_samr_query_dispinfo( uint16 vuid, prs_struct *data, prs_struct * samr_reply_query_dispinfo(&q_e, rdata); } -#if 0 /******************************************************************* samr_reply_query_groupmem ********************************************************************/ @@ -741,9 +740,14 @@ static void samr_reply_query_groupmem(SAMR_Q_QUERY_GROUPMEM *q_u, /* store the response in the SMB stream */ samr_io_r_query_groupmem("", &r_u, rdata, 0); - if (sid != NULL) + if (rid != NULL) { - free(sid); + free(rid); + } + + if (attr != NULL) + { + free(attr); } DEBUG(5,("samr_query_groupmem: %d\n", __LINE__)); @@ -764,8 +768,6 @@ static void api_samr_query_groupmem( uint16 vuid, prs_struct *data, prs_struct * samr_reply_query_groupmem(&q_u, rdata); } -#endif - /******************************************************************* samr_reply_query_groupinfo @@ -793,13 +795,13 @@ static void samr_reply_query_groupinfo(SAMR_Q_QUERY_GROUPINFO *q_u, { r_e.ptr = 1; ctr.switch_value = 1; - make_samr_group_info1(&ctr.group.info1, "<account name>", "<account description>"); + make_samr_group_info1(&ctr.group.info1, "account name", "account description"); } else if (q_u->switch_level == 4) { r_e.ptr = 1; ctr.switch_value = 4; - make_samr_group_info4(&ctr.group.info4, "<account description>"); + make_samr_group_info4(&ctr.group.info4, "account description"); } else { @@ -1296,7 +1298,6 @@ static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u, sid_copy(&sid, &pol_sid); sid_append_rid(&sid, q_u->gid[i]); lookup_sid(&sid, group_names[i], &group_attrs[i]); - group_attrs[i] = 0x2; } } @@ -2075,6 +2076,7 @@ static struct api_struct api_samr_cmds [] = { "SAMR_ENUM_DOM_ALIASES" , SAMR_ENUM_DOM_ALIASES , api_samr_enum_dom_aliases }, { "SAMR_QUERY_USERALIASES", SAMR_QUERY_USERALIASES, api_samr_query_useraliases}, { "SAMR_QUERY_ALIASMEM" , SAMR_QUERY_ALIASMEM , api_samr_query_aliasmem }, + { "SAMR_QUERY_GROUPMEM" , SAMR_QUERY_GROUPMEM , api_samr_query_groupmem }, { "SAMR_LOOKUP_NAMES" , SAMR_LOOKUP_NAMES , api_samr_lookup_names }, { "SAMR_OPEN_USER" , SAMR_OPEN_USER , api_samr_open_user }, { "SAMR_QUERY_USERINFO" , SAMR_QUERY_USERINFO , api_samr_query_userinfo }, |