samr: for correctness, rename samr_RidTypeArray to samr_RidAttrArray.

[mat/samba.git] / source3 / utils / net_rpc.c

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 0ce2cd5d49635ba3bea6ee7246a9ab17e121775b..7c49645cfc665d6869fd579266005619425a16e3 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -24,12 +24,19 @@
 #include "utils/net.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/cli_samr.h"
+#include "rpc_client/init_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "../librpc/gen_ndr/cli_initshutdown.h"
 #include "../librpc/gen_ndr/cli_winreg.h"
+#include "secrets.h"
+#include "lib/netapi/netapi.h"
+#include "rpc_client/init_lsa.h"
+#include "../libcli/security/dom_sid.h"
 
 static int net_mode_share;
 static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
@@ -59,7 +66,7 @@ static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
  **/
 
 NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                  DOM_SID **domain_sid,
+                                  struct dom_sid **domain_sid,
                                   const char **domain_name)
 {
        struct rpc_pipe_client *lsa_pipe = NULL;
@@ -128,7 +135,7 @@ int run_rpc_command(struct net_context *c,
        struct rpc_pipe_client *pipe_hnd = NULL;
        TALLOC_CTX *mem_ctx;
        NTSTATUS nt_status;
-       DOM_SID *domain_sid;
+       struct dom_sid *domain_sid;
        const char *domain_name;
        int ret = -1;
 
@@ -241,7 +248,7 @@ fail:
  **/
 
 static NTSTATUS rpc_changetrustpw_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -309,7 +316,7 @@ int net_rpc_changetrustpw(struct net_context *c, int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_oldjoin_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -488,7 +495,7 @@ int net_rpc_join(struct net_context *c, int argc, const char **argv)
  **/
 
 NTSTATUS rpc_info_internals(struct net_context *c,
-                       const DOM_SID *domain_sid,
+                       const struct dom_sid *domain_sid,
                        const char *domain_name,
                        struct cli_state *cli,
                        struct rpc_pipe_client *pipe_hnd,
@@ -585,7 +592,7 @@ int net_rpc_info(struct net_context *c, int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_getsid_internals(struct net_context *c,
-                       const DOM_SID *domain_sid,
+                       const struct dom_sid *domain_sid,
                        const char *domain_name,
                        struct cli_state *cli,
                        struct rpc_pipe_client *pipe_hnd,
@@ -1006,7 +1013,7 @@ int net_rpc_user(struct net_context *c, int argc, const char **argv)
                        NET_TRANSPORT_RPC,
                        N_("List domain groups of user"),
                        N_("net rpc user info\n"
-                          "    Lis domain groups of user")
+                          "    List domain groups of user")
                },
                {
                        "delete",
@@ -1103,7 +1110,7 @@ static NTSTATUS rpc_sh_handle_user(struct net_context *c,
 {
        struct policy_handle connect_pol, domain_pol, user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID sid;
+       struct dom_sid sid;
        uint32 rid;
        enum lsa_SidType type;
 
@@ -1492,7 +1499,7 @@ static int rpc_group_usage(struct net_context *c, int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_group_delete_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -1504,7 +1511,7 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c,
        bool group_is_primary = false;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        uint32_t group_rid;
-       struct samr_RidTypeArray *rids = NULL;
+       struct samr_RidAttrArray *rids = NULL;
        /* char **names; */
        int i;
        /* struct samr_RidWithAttribute *user_gids; */
@@ -1778,10 +1785,10 @@ static int rpc_group_add(struct net_context *c, int argc, const char **argv)
 static NTSTATUS get_sid_from_name(struct cli_state *cli,
                                TALLOC_CTX *mem_ctx,
                                const char *name,
-                               DOM_SID *sid,
+                               struct dom_sid *sid,
                                enum lsa_SidType *type)
 {
-       DOM_SID *sids = NULL;
+       struct dom_sid *sids = NULL;
        enum lsa_SidType *types = NULL;
        struct rpc_pipe_client *pipe_hnd = NULL;
        struct policy_handle lsa_pol;
@@ -1819,7 +1826,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
 
                /* Try as S-1-5-whatever */
 
-               DOM_SID tmp_sid;
+               struct dom_sid tmp_sid;
 
                if (string_to_sid(&tmp_sid, name)) {
                        sid_copy(sid, &tmp_sid);
@@ -1833,7 +1840,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
 
 static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx,
-                               const DOM_SID *group_sid,
+                               const struct dom_sid *group_sid,
                                const char *member)
 {
        struct policy_handle connect_pol, domain_pol;
@@ -1844,7 +1851,7 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
        struct samr_Ids rids, rid_types;
        struct lsa_String lsa_acct_name;
 
-       DOM_SID sid;
+       struct dom_sid sid;
 
        sid_copy(&sid, group_sid);
 
@@ -1908,7 +1915,7 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
 
 static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx,
-                               const DOM_SID *alias_sid,
+                               const struct dom_sid *alias_sid,
                                const char *member)
 {
        struct policy_handle connect_pol, domain_pol;
@@ -1916,10 +1923,10 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
        uint32 alias_rid;
        struct policy_handle alias_pol;
 
-       DOM_SID member_sid;
+       struct dom_sid member_sid;
        enum lsa_SidType member_type;
 
-       DOM_SID sid;
+       struct dom_sid sid;
 
        sid_copy(&sid, alias_sid);
 
@@ -1979,7 +1986,7 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
 }
 
 static NTSTATUS rpc_group_addmem_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -1987,7 +1994,7 @@ static NTSTATUS rpc_group_addmem_internals(struct net_context *c,
                                        int argc,
                                        const char **argv)
 {
-       DOM_SID group_sid;
+       struct dom_sid group_sid;
        enum lsa_SidType group_type;
 
        if (argc != 2 || c->display_usage) {
@@ -2045,7 +2052,7 @@ static int rpc_group_addmem(struct net_context *c, int argc, const char **argv)
 static NTSTATUS rpc_del_groupmem(struct net_context *c,
                                struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx,
-                               const DOM_SID *group_sid,
+                               const struct dom_sid *group_sid,
                                const char *member)
 {
        struct policy_handle connect_pol, domain_pol;
@@ -2056,7 +2063,7 @@ static NTSTATUS rpc_del_groupmem(struct net_context *c,
        struct samr_Ids rids, rid_types;
        struct lsa_String lsa_acct_name;
 
-       DOM_SID sid;
+       struct dom_sid sid;
 
        sid_copy(&sid, group_sid);
 
@@ -2114,7 +2121,7 @@ static NTSTATUS rpc_del_groupmem(struct net_context *c,
 
 static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx,
-                               const DOM_SID *alias_sid,
+                               const struct dom_sid *alias_sid,
                                const char *member)
 {
        struct policy_handle connect_pol, domain_pol;
@@ -2122,10 +2129,10 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
        uint32 alias_rid;
        struct policy_handle alias_pol;
 
-       DOM_SID member_sid;
+       struct dom_sid member_sid;
        enum lsa_SidType member_type;
 
-       DOM_SID sid;
+       struct dom_sid sid;
 
        sid_copy(&sid, alias_sid);
 
@@ -2182,7 +2189,7 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
 }
 
 static NTSTATUS rpc_group_delmem_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -2190,7 +2197,7 @@ static NTSTATUS rpc_group_delmem_internals(struct net_context *c,
                                        int argc,
                                        const char **argv)
 {
-       DOM_SID group_sid;
+       struct dom_sid group_sid;
        enum lsa_SidType group_type;
 
        if (argc != 2 || c->display_usage) {
@@ -2262,7 +2269,7 @@ static int rpc_group_delmem(struct net_context *c, int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_group_list_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -2497,7 +2504,7 @@ static NTSTATUS rpc_list_group_members(struct net_context *c,
                                        struct rpc_pipe_client *pipe_hnd,
                                        TALLOC_CTX *mem_ctx,
                                        const char *domain_name,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        struct policy_handle *domain_pol,
                                        uint32 rid)
 {
@@ -2505,7 +2512,7 @@ static NTSTATUS rpc_list_group_members(struct net_context *c,
        struct policy_handle group_pol;
        uint32 num_members, *group_rids;
        int i;
-       struct samr_RidTypeArray *rids = NULL;
+       struct samr_RidAttrArray *rids = NULL;
        struct lsa_Strings names;
        struct samr_Ids types;
 
@@ -2580,7 +2587,7 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c,
        struct rpc_pipe_client *lsa_pipe;
        struct policy_handle alias_pol, lsa_pol;
        uint32 num_members;
-       DOM_SID *alias_sids;
+       struct dom_sid *alias_sids;
        char **domains;
        char **names;
        enum lsa_SidType *types;
@@ -2629,7 +2636,7 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c,
                return result;
        }
 
-       alias_sids = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
+       alias_sids = TALLOC_ZERO_ARRAY(mem_ctx, struct dom_sid, num_members);
        if (!alias_sids) {
                d_fprintf(stderr, _("Out of memory\n"));
                TALLOC_FREE(lsa_pipe);
@@ -2672,7 +2679,7 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c,
 }
 
 static NTSTATUS rpc_group_members_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -2719,7 +2726,7 @@ static NTSTATUS rpc_group_members_internals(struct net_context *c,
 
                /* Ok, did not find it in the global sam, try with builtin */
 
-               DOM_SID sid_Builtin;
+               struct dom_sid sid_Builtin;
 
                rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
 
@@ -3221,7 +3228,7 @@ static bool check_share_sanity(struct net_context *c, struct cli_state *cli,
  **/
 
 static NTSTATUS rpc_share_migrate_shares_internals(struct net_context *c,
-                                               const DOM_SID *domain_sid,
+                                               const struct dom_sid *domain_sid,
                                                const char *domain_name,
                                                struct cli_state *cli,
                                                struct rpc_pipe_client *pipe_hnd,
@@ -3340,7 +3347,7 @@ static int rpc_share_migrate_shares(struct net_context *c, int argc,
  * @param state        arg-pointer
  *
  **/
-static void copy_fn(const char *mnt, file_info *f,
+static void copy_fn(const char *mnt, struct file_info *f,
                    const char *mask, void *state)
 {
        static NTSTATUS nt_status;
@@ -3449,6 +3456,7 @@ static bool sync_files(struct copy_clistate *cp_clistate, const char *mask)
 {
        struct cli_state *targetcli;
        char *targetpath = NULL;
+       NTSTATUS status;
 
        DEBUG(3,("calling cli_list with mask: %s\n", mask));
 
@@ -3460,9 +3468,11 @@ static bool sync_files(struct copy_clistate *cp_clistate, const char *mask)
                return false;
        }
 
-       if (cli_list(targetcli, targetpath, cp_clistate->attribute, copy_fn, cp_clistate) == -1) {
+       status = cli_list(targetcli, targetpath, cp_clistate->attribute,
+                         copy_fn, cp_clistate);
+       if (!NT_STATUS_IS_OK(status)) {
                d_fprintf(stderr, _("listing %s failed with error: %s\n"),
-                       mask, cli_errstr(targetcli));
+                         mask, nt_errstr(status));
                return false;
        }
 
@@ -3526,7 +3536,7 @@ bool copy_top_level_perms(struct net_context *c,
  **/
 
 static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
-                                               const DOM_SID *domain_sid,
+                                               const struct dom_sid *domain_sid,
                                                const char *domain_name,
                                                struct cli_state *cli,
                                                struct rpc_pipe_client *pipe_hnd,
@@ -3684,7 +3694,7 @@ static int rpc_share_migrate_files(struct net_context *c, int argc, const char *
  **/
 
 static NTSTATUS rpc_share_migrate_security_internals(struct net_context *c,
-                                               const DOM_SID *domain_sid,
+                                               const struct dom_sid *domain_sid,
                                                const char *domain_name,
                                                struct cli_state *cli,
                                                struct rpc_pipe_client *pipe_hnd,
@@ -3894,9 +3904,9 @@ static int rpc_share_migrate(struct net_context *c, int argc, const char **argv)
 }
 
 struct full_alias {
-       DOM_SID sid;
+       struct dom_sid sid;
        uint32 num_members;
-       DOM_SID *members;
+       struct dom_sid *members;
 };
 
 static int num_server_aliases;
@@ -3922,7 +3932,7 @@ static void push_alias(TALLOC_CTX *mem_ctx, struct full_alias *alias)
 static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
                                        TALLOC_CTX *mem_ctx,
                                        struct policy_handle *connect_pol,
-                                       const DOM_SID *domain_sid)
+                                       const struct dom_sid *domain_sid)
 {
        uint32 start_idx, max_entries, num_entries, i;
        struct samr_SamArray *groups = NULL;
@@ -3979,7 +3989,7 @@ static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
                        alias.members = NULL;
 
                        if (alias.num_members > 0) {
-                               alias.members = SMB_MALLOC_ARRAY(DOM_SID, alias.num_members);
+                               alias.members = SMB_MALLOC_ARRAY(struct dom_sid, alias.num_members);
 
                                for (j = 0; j < alias.num_members; j++)
                                        sid_copy(&alias.members[j],
@@ -4006,7 +4016,7 @@ static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
  */
 
 static NTSTATUS rpc_aliaslist_dump(struct net_context *c,
-                               const DOM_SID *domain_sid,
+                               const struct dom_sid *domain_sid,
                                const char *domain_name,
                                struct cli_state *cli,
                                struct rpc_pipe_client *pipe_hnd,
@@ -4072,7 +4082,7 @@ static NTSTATUS rpc_aliaslist_dump(struct net_context *c,
  */
 
 static NTSTATUS rpc_aliaslist_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -4105,45 +4115,45 @@ static NTSTATUS rpc_aliaslist_internals(struct net_context *c,
        return result;
 }
 
-static void init_user_token(NT_USER_TOKEN *token, DOM_SID *user_sid)
+static void init_user_token(struct security_token *token, struct dom_sid *user_sid)
 {
        token->num_sids = 4;
 
-       if (!(token->user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4))) {
+       if (!(token->sids = SMB_MALLOC_ARRAY(struct dom_sid, 4))) {
                d_fprintf(stderr, "malloc %s\n",_("failed"));
                token->num_sids = 0;
                return;
        }
 
-       token->user_sids[0] = *user_sid;
-       sid_copy(&token->user_sids[1], &global_sid_World);
-       sid_copy(&token->user_sids[2], &global_sid_Network);
-       sid_copy(&token->user_sids[3], &global_sid_Authenticated_Users);
+       token->sids[0] = *user_sid;
+       sid_copy(&token->sids[1], &global_sid_World);
+       sid_copy(&token->sids[2], &global_sid_Network);
+       sid_copy(&token->sids[3], &global_sid_Authenticated_Users);
 }
 
-static void free_user_token(NT_USER_TOKEN *token)
+static void free_user_token(struct security_token *token)
 {
-       SAFE_FREE(token->user_sids);
+       SAFE_FREE(token->sids);
 }
 
-static void add_sid_to_token(NT_USER_TOKEN *token, DOM_SID *sid)
+static void add_sid_to_token(struct security_token *token, struct dom_sid *sid)
 {
        if (is_sid_in_token(token, sid))
                return;
 
-       token->user_sids = SMB_REALLOC_ARRAY(token->user_sids, DOM_SID, token->num_sids+1);
-       if (!token->user_sids) {
+       token->sids = SMB_REALLOC_ARRAY(token->sids, struct dom_sid, token->num_sids+1);
+       if (!token->sids) {
                return;
        }
 
-       sid_copy(&token->user_sids[token->num_sids], sid);
+       sid_copy(&token->sids[token->num_sids], sid);
 
        token->num_sids += 1;
 }
 
 struct user_token {
        fstring name;
-       NT_USER_TOKEN token;
+       struct security_token token;
 };
 
 static void dump_user_token(struct user_token *token)
@@ -4153,23 +4163,23 @@ static void dump_user_token(struct user_token *token)
        d_printf("%s\n", token->name);
 
        for (i=0; i<token->token.num_sids; i++) {
-               d_printf(" %s\n", sid_string_tos(&token->token.user_sids[i]));
+               d_printf(" %s\n", sid_string_tos(&token->token.sids[i]));
        }
 }
 
-static bool is_alias_member(DOM_SID *sid, struct full_alias *alias)
+static bool is_alias_member(struct dom_sid *sid, struct full_alias *alias)
 {
        int i;
 
        for (i=0; i<alias->num_members; i++) {
-               if (sid_compare(sid, &alias->members[i]) == 0)
+               if (dom_sid_compare(sid, &alias->members[i]) == 0)
                        return true;
        }
 
        return false;
 }
 
-static void collect_sid_memberships(NT_USER_TOKEN *token, DOM_SID sid)
+static void collect_sid_memberships(struct security_token *token, struct dom_sid sid)
 {
        int i;
 
@@ -4186,24 +4196,24 @@ static void collect_sid_memberships(NT_USER_TOKEN *token, DOM_SID sid)
  * add them to the token.
  */
 
-static void collect_alias_memberships(NT_USER_TOKEN *token)
+static void collect_alias_memberships(struct security_token *token)
 {
        int num_global_sids = token->num_sids;
        int i;
 
        for (i=0; i<num_global_sids; i++) {
-               collect_sid_memberships(token, token->user_sids[i]);
+               collect_sid_memberships(token, token->sids[i]);
        }
 }
 
-static bool get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *token)
+static bool get_user_sids(const char *domain, const char *user, struct security_token *token)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        enum wbcSidType type;
        fstring full_name;
        struct wbcDomainSid wsid;
        char *sid_str = NULL;
-       DOM_SID user_sid;
+       struct dom_sid user_sid;
        uint32_t num_groups;
        gid_t *groups = NULL;
        uint32_t i;
@@ -4253,7 +4263,7 @@ static bool get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *t
 
        for (i = 0; i < num_groups; i++) {
                gid_t gid = groups[i];
-               DOM_SID sid;
+               struct dom_sid sid;
 
                wbc_status = wbcGidToSid(gid, &wsid);
                if (!WBC_ERROR_IS_OK(wbc_status)) {
@@ -4372,7 +4382,7 @@ static bool get_user_tokens_from_file(FILE *f,
                if (line[0] == ' ') {
                        /* We have a SID */
 
-                       DOM_SID sid;
+                       struct dom_sid sid;
                        if(!string_to_sid(&sid, &line[1])) {
                                DEBUG(1,("get_user_tokens_from_file: Could "
                                        "not convert sid %s \n",&line[1]));
@@ -4401,7 +4411,7 @@ static bool get_user_tokens_from_file(FILE *f,
 
                fstrcpy(token->name, line);
                token->token.num_sids = 0;
-               token->token.user_sids = NULL;
+               token->token.sids = NULL;
                continue;
        }
        
@@ -4536,7 +4546,7 @@ static void collect_share(const char *name, uint32 m,
  **/
 
 static NTSTATUS rpc_share_allowedusers_internals(struct net_context *c,
-                                               const DOM_SID *domain_sid,
+                                               const struct dom_sid *domain_sid,
                                                const char *domain_name,
                                                struct cli_state *cli,
                                                struct rpc_pipe_client *pipe_hnd,
@@ -5051,7 +5061,7 @@ int net_rpc_file(struct net_context *c, int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_shutdown_abort_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -5090,7 +5100,7 @@ static NTSTATUS rpc_shutdown_abort_internals(struct net_context *c,
  **/
 
 static NTSTATUS rpc_reg_shutdown_abort_internals(struct net_context *c,
-                                               const DOM_SID *domain_sid,
+                                               const struct dom_sid *domain_sid,
                                                const char *domain_name,
                                                struct cli_state *cli,
                                                struct rpc_pipe_client *pipe_hnd,
@@ -5166,7 +5176,7 @@ static int rpc_shutdown_abort(struct net_context *c, int argc,
  **/
 
 NTSTATUS rpc_init_shutdown_internals(struct net_context *c,
-                                    const DOM_SID *domain_sid,
+                                    const struct dom_sid *domain_sid,
                                     const char *domain_name,
                                     struct cli_state *cli,
                                     struct rpc_pipe_client *pipe_hnd,
@@ -5220,7 +5230,7 @@ NTSTATUS rpc_init_shutdown_internals(struct net_context *c,
  **/
 
 NTSTATUS rpc_reg_shutdown_internals(struct net_context *c,
-                                   const DOM_SID *domain_sid,
+                                   const struct dom_sid *domain_sid,
                                    const char *domain_name,
                                    struct cli_state *cli,
                                    struct rpc_pipe_client *pipe_hnd,
@@ -5317,7 +5327,7 @@ static int rpc_shutdown(struct net_context *c, int argc, const char **argv)
  */
 
 static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
-                                               const DOM_SID *domain_sid,
+                                               const struct dom_sid *domain_sid,
                                                const char *domain_name,
                                                struct cli_state *cli,
                                                struct rpc_pipe_client *pipe_hnd,
@@ -5478,7 +5488,7 @@ static int rpc_trustdom_add(struct net_context *c, int argc, const char **argv)
  */
 
 static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -5489,7 +5499,7 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
        struct policy_handle connect_pol, domain_pol, user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        char *acct_name;
-       DOM_SID trust_acct_sid;
+       struct dom_sid trust_acct_sid;
        struct samr_Ids user_rids, name_types;
        struct lsa_String lsa_acct_name;
 
@@ -5684,7 +5694,7 @@ static int rpc_trustdom_establish(struct net_context *c, int argc,
        struct policy_handle connect_hnd;
        TALLOC_CTX *mem_ctx;
        NTSTATUS nt_status;
-       DOM_SID *domain_sid;
+       struct dom_sid *domain_sid;
 
        char* domain_name;
        char* acct_name;
@@ -5887,7 +5897,7 @@ done:
 }
 
 static NTSTATUS rpc_query_domain_sid(struct net_context *c,
-                                       const DOM_SID *domain_sid,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -5903,7 +5913,7 @@ static NTSTATUS rpc_query_domain_sid(struct net_context *c,
        return NT_STATUS_OK;
 }
 
-static void print_trusted_domain(DOM_SID *dom_sid, const char *trusted_dom_name)
+static void print_trusted_domain(struct dom_sid *dom_sid, const char *trusted_dom_name)
 {
        fstring ascii_sid;
 
@@ -5916,7 +5926,7 @@ static void print_trusted_domain(DOM_SID *dom_sid, const char *trusted_dom_name)
 static NTSTATUS vampire_trusted_domain(struct rpc_pipe_client *pipe_hnd,
                                      TALLOC_CTX *mem_ctx,
                                      struct policy_handle *pol,
-                                     DOM_SID dom_sid,
+                                     struct dom_sid dom_sid,
                                      const char *trusted_dom_name)
 {
        NTSTATUS nt_status;
@@ -5982,7 +5992,7 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc,
        struct rpc_pipe_client *pipe_hnd = NULL;
        NTSTATUS nt_status;
        const char *domain_name = NULL;
-       DOM_SID *queried_dom_sid;
+       struct dom_sid *queried_dom_sid;
        struct policy_handle connect_hnd;
        union lsa_PolicyInformation *info = NULL;
 
@@ -6135,7 +6145,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
        struct rpc_pipe_client *pipe_hnd = NULL;
        NTSTATUS nt_status;
        const char *domain_name = NULL;
-       DOM_SID *queried_dom_sid;
+       struct dom_sid *queried_dom_sid;
        int ascii_dom_name_len;
        struct policy_handle connect_hnd;
        union lsa_PolicyInformation *info = NULL;