From bb283af16fe3858310d762cb5998909ae3b810de Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Nov 2009 19:38:09 +0100 Subject: Revert "s3: Do not directly reference the ndr_table_* in rpcclient" This reverts commit 70c698fd547c4bc19cf77693608bbb34acac40b5. --- source3/rpcclient/cmd_samr.c | 136 +++++++++++-------------------------------- 1 file changed, 35 insertions(+), 101 deletions(-) (limited to 'source3/rpcclient/cmd_samr.c') diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index f1a04efe17..e52411f8f7 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -2916,106 +2916,40 @@ struct cmd_set samr_commands[] = { { "SAMR" }, - { "queryuser", RPC_RTYPE_NTSTATUS, cmd_samr_query_user, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query user info", "" }, - { "querygroup", RPC_RTYPE_NTSTATUS, cmd_samr_query_group, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query group info", "" }, - { "queryusergroups", RPC_RTYPE_NTSTATUS, cmd_samr_query_usergroups, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query user groups", "" }, - { "queryuseraliases", RPC_RTYPE_NTSTATUS, cmd_samr_query_useraliases, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query user aliases", "" }, - { "querygroupmem", RPC_RTYPE_NTSTATUS, cmd_samr_query_groupmem, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query group membership", "" }, - { "queryaliasmem", RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasmem, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query alias membership", "" }, - { "queryaliasinfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasinfo, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query alias info", "" }, - { "deletealias", RPC_RTYPE_NTSTATUS, cmd_samr_delete_alias, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Delete an alias", "" }, - { "querydispinfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query display info", "" }, - { "querydispinfo2", RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo2, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query display info", "" }, - { "querydispinfo3", RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo3, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query display info", "" }, - { "querydominfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_dominfo, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query domain info", "" }, - { "enumdomusers", RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_users, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Enumerate domain users", "" }, - { "enumdomgroups", RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_groups, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Enumerate domain groups", "" }, - { "enumalsgroups", RPC_RTYPE_NTSTATUS, cmd_samr_enum_als_groups, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Enumerate alias groups", "" }, - { "enumdomains", RPC_RTYPE_NTSTATUS, cmd_samr_enum_domains, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Enumerate domains", "" }, - - { "createdomuser", RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_user, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Create domain user", "" }, - { "createdomgroup", RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_group, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Create domain group", "" }, - { "createdomalias", RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_alias, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Create domain alias", "" }, - { "samlookupnames", RPC_RTYPE_NTSTATUS, cmd_samr_lookup_names, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Look up names", "" }, - { "samlookuprids", RPC_RTYPE_NTSTATUS, cmd_samr_lookup_rids, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Look up names", "" }, - { "deletedomgroup", RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_group, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Delete domain group", "" }, - { "deletedomuser", RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_user, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Delete domain user", "" }, - { "samquerysecobj", RPC_RTYPE_NTSTATUS, cmd_samr_query_sec_obj, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Query SAMR security object", "" }, - { "getdompwinfo", RPC_RTYPE_NTSTATUS, cmd_samr_get_dom_pwinfo, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Retrieve domain password info", "" }, - { "getusrdompwinfo", RPC_RTYPE_NTSTATUS, cmd_samr_get_usrdom_pwinfo, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Retrieve user domain password info", "" }, - - { "lookupdomain", RPC_RTYPE_NTSTATUS, cmd_samr_lookup_domain, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Lookup Domain Name", "" }, - { "chgpasswd", RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Change user password", "" }, - { "chgpasswd2", RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd2, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Change user password", "" }, - { "chgpasswd3", RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd3, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Change user password", "" }, - { "getdispinfoidx", RPC_RTYPE_NTSTATUS, cmd_samr_get_dispinfo_idx, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Get Display Information Index", "" }, - { "setuserinfo", RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Set user info", "" }, - { "setuserinfo2", RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo2, - NULL, NDR_SAMR_UUID, NDR_SAMR_VERSION, NULL, - "Set user info2", "" }, + { "queryuser", RPC_RTYPE_NTSTATUS, cmd_samr_query_user, NULL, &ndr_table_samr.syntax_id, NULL, "Query user info", "" }, + { "querygroup", RPC_RTYPE_NTSTATUS, cmd_samr_query_group, NULL, &ndr_table_samr.syntax_id, NULL, "Query group info", "" }, + { "queryusergroups", RPC_RTYPE_NTSTATUS, cmd_samr_query_usergroups, NULL, &ndr_table_samr.syntax_id, NULL, "Query user groups", "" }, + { "queryuseraliases", RPC_RTYPE_NTSTATUS, cmd_samr_query_useraliases, NULL, &ndr_table_samr.syntax_id, NULL, "Query user aliases", "" }, + { "querygroupmem", RPC_RTYPE_NTSTATUS, cmd_samr_query_groupmem, NULL, &ndr_table_samr.syntax_id, NULL, "Query group membership", "" }, + { "queryaliasmem", RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasmem, NULL, &ndr_table_samr.syntax_id, NULL, "Query alias membership", "" }, + { "queryaliasinfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasinfo, NULL, &ndr_table_samr.syntax_id, NULL, "Query alias info", "" }, + { "deletealias", RPC_RTYPE_NTSTATUS, cmd_samr_delete_alias, NULL, &ndr_table_samr.syntax_id, NULL, "Delete an alias", "" }, + { "querydispinfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo, NULL, &ndr_table_samr.syntax_id, NULL, "Query display info", "" }, + { "querydispinfo2", RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo2, NULL, &ndr_table_samr.syntax_id, NULL, "Query display info", "" }, + { "querydispinfo3", RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo3, NULL, &ndr_table_samr.syntax_id, NULL, "Query display info", "" }, + { "querydominfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_dominfo, NULL, &ndr_table_samr.syntax_id, NULL, "Query domain info", "" }, + { "enumdomusers", RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_users, NULL, &ndr_table_samr.syntax_id, NULL, "Enumerate domain users", "" }, + { "enumdomgroups", RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_groups, NULL, &ndr_table_samr.syntax_id, NULL, "Enumerate domain groups", "" }, + { "enumalsgroups", RPC_RTYPE_NTSTATUS, cmd_samr_enum_als_groups, NULL, &ndr_table_samr.syntax_id, NULL, "Enumerate alias groups", "" }, + { "enumdomains", RPC_RTYPE_NTSTATUS, cmd_samr_enum_domains, NULL, &ndr_table_samr.syntax_id, NULL, "Enumerate domains", "" }, + + { "createdomuser", RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_user, NULL, &ndr_table_samr.syntax_id, NULL, "Create domain user", "" }, + { "createdomgroup", RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_group, NULL, &ndr_table_samr.syntax_id, NULL, "Create domain group", "" }, + { "createdomalias", RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_alias, NULL, &ndr_table_samr.syntax_id, NULL, "Create domain alias", "" }, + { "samlookupnames", RPC_RTYPE_NTSTATUS, cmd_samr_lookup_names, NULL, &ndr_table_samr.syntax_id, NULL, "Look up names", "" }, + { "samlookuprids", RPC_RTYPE_NTSTATUS, cmd_samr_lookup_rids, NULL, &ndr_table_samr.syntax_id, NULL, "Look up names", "" }, + { "deletedomgroup", RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_group, NULL, &ndr_table_samr.syntax_id, NULL, "Delete domain group", "" }, + { "deletedomuser", RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_user, NULL, &ndr_table_samr.syntax_id, NULL, "Delete domain user", "" }, + { "samquerysecobj", RPC_RTYPE_NTSTATUS, cmd_samr_query_sec_obj, NULL, &ndr_table_samr.syntax_id, NULL, "Query SAMR security object", "" }, + { "getdompwinfo", RPC_RTYPE_NTSTATUS, cmd_samr_get_dom_pwinfo, NULL, &ndr_table_samr.syntax_id, NULL, "Retrieve domain password info", "" }, + { "getusrdompwinfo", RPC_RTYPE_NTSTATUS, cmd_samr_get_usrdom_pwinfo, NULL, &ndr_table_samr.syntax_id, NULL, "Retrieve user domain password info", "" }, + + { "lookupdomain", RPC_RTYPE_NTSTATUS, cmd_samr_lookup_domain, NULL, &ndr_table_samr.syntax_id, NULL, "Lookup Domain Name", "" }, + { "chgpasswd", RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd, NULL, &ndr_table_samr.syntax_id, NULL, "Change user password", "" }, + { "chgpasswd2", RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd2, NULL, &ndr_table_samr.syntax_id, NULL, "Change user password", "" }, + { "chgpasswd3", RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd3, NULL, &ndr_table_samr.syntax_id, NULL, "Change user password", "" }, + { "getdispinfoidx", RPC_RTYPE_NTSTATUS, cmd_samr_get_dispinfo_idx, NULL, &ndr_table_samr.syntax_id, NULL, "Get Display Information Index", "" }, + { "setuserinfo", RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo, NULL, &ndr_table_samr.syntax_id, NULL, "Set user info", "" }, + { "setuserinfo2", RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo2, NULL, &ndr_table_samr.syntax_id, NULL, "Set user info2", "" }, { NULL } }; -- cgit