s3:dom_sid Global replace of DOM_SID with struct dom_sid

This matches the structure that new code is being written to,
and removes one more of the old-style named structures, and
the need to know that is is just an alias for struct dom_sid.

Andrew Bartlett

Signed-off-by: Günther Deschner <gd@samba.org>

25 files changed, 216 insertions, 216 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 85ef1ec407..c677e3a9ba 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -231,7 +231,7 @@ static int net_getauthuser(struct net_context *c, int argc, const char **argv)
  */
 static int net_getlocalsid(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID sid;
+        struct dom_sid sid;
 	const char *name;
 	fstring sid_str;
 
@@ -271,7 +271,7 @@ static int net_getlocalsid(struct net_context *c, int argc, const char **argv)
 
 static int net_setlocalsid(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 
 	if ( (argc != 1)
 	     || (strncmp(argv[0], "S-1-5-21-", strlen("S-1-5-21-")) != 0)
@@ -292,7 +292,7 @@ static int net_setlocalsid(struct net_context *c, int argc, const char **argv)
 
 static int net_setdomainsid(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 
 	if ( (argc != 1)
 	     || (strncmp(argv[0], "S-1-5-21-", strlen("S-1-5-21-")) != 0)
@@ -313,7 +313,7 @@ static int net_setdomainsid(struct net_context *c, int argc, const char **argv)
 
 static int net_getdomainsid(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID domain_sid;
+	struct dom_sid domain_sid;
 	fstring sid_str;
 
 	if (argc > 0) {
diff --git a/source3/utils/net.h b/source3/utils/net.h
index 91e8c53099..21f393b243 100644
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -109,7 +109,7 @@ struct functable {
 };
 
 typedef NTSTATUS (*rpc_command_fn)(struct net_context *c,
-				const DOM_SID *,
+				const struct dom_sid *,
 				const char *,
 				struct cli_state *cli,
 				struct rpc_pipe_client *,
@@ -129,7 +129,7 @@ typedef struct copy_clistate {
 struct rpc_sh_ctx {
 	struct cli_state *cli;
 
-	DOM_SID *domain_sid;
+	struct dom_sid *domain_sid;
 	const char *domain_name;
 
 	const char *whoami;
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 2777772711..fa6cf8309b 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -539,7 +539,7 @@ static int ads_user_info(struct net_context *c, int argc, const char **argv)
 	char **grouplist;
 	char *primary_group;
 	char *escaped_user;
-	DOM_SID primary_group_sid;
+	struct dom_sid primary_group_sid;
 	uint32_t group_rid;
 	enum SID_NAME_USE type;
 
@@ -2181,7 +2181,7 @@ static int net_ads_sid(struct net_context *c, int argc, const char **argv)
 	const char *sid_string;
 	const char **attrs;
 	LDAPMessage *res = NULL;
-	DOM_SID sid;
+	struct dom_sid sid;
 
 	if (argc < 1 || c->display_usage) {
 		return net_ads_sid_usage(c, argc, argv);
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 9b46808b8b..5e3b5bc61a 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -28,7 +28,7 @@
  Figure out if the input was an NT group or a SID string.
  Return the SID.
 **********************************************************/
-static bool get_sid_from_input(DOM_SID *sid, char *input)
+static bool get_sid_from_input(struct dom_sid *sid, char *input)
 {
 	GROUP_MAP map;
 
@@ -123,7 +123,7 @@ static int net_groupmap_list(struct net_context *c, int argc, const char **argv)
 
 	/* list a single group is given a name */
 	if ( ntgroup[0] || sid_string[0] ) {
-		DOM_SID sid;
+		struct dom_sid sid;
 		GROUP_MAP map;
 
 		if ( sid_string[0] )
@@ -165,7 +165,7 @@ static int net_groupmap_list(struct net_context *c, int argc, const char **argv)
 
 static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	fstring ntgroup = "";
 	fstring unixgrp = "";
 	fstring string_sid = "";
@@ -335,7 +335,7 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 
 static int net_groupmap_modify(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	GROUP_MAP map;
 	fstring ntcomment = "";
 	fstring type = "";
@@ -483,7 +483,7 @@ static int net_groupmap_modify(struct net_context *c, int argc, const char **arg
 
 static int net_groupmap_delete(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	fstring ntgroup = "";
 	fstring sid_string = "";
 	int i;
@@ -580,7 +580,7 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv)
 	have_map = pdb_getgrnam(&map, ntgroup);
 
 	if (!have_map) {
-		DOM_SID sid;
+		struct dom_sid sid;
 		have_map = ( (strncmp(ntgroup, "S-", 2) == 0) &&
 			     string_to_sid(&sid, ntgroup) &&
 			     pdb_getgrsid(&map, sid) );
@@ -705,7 +705,7 @@ static int net_groupmap_cleanup(struct net_context *c, int argc, const char **ar
 
 static int net_groupmap_addmem(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID alias, member;
+	struct dom_sid alias, member;
 
 	if ( (argc != 2) ||
 	     c->display_usage ||
@@ -728,7 +728,7 @@ static int net_groupmap_addmem(struct net_context *c, int argc, const char **arg
 
 static int net_groupmap_delmem(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID alias, member;
+	struct dom_sid alias, member;
 
 	if ( (argc != 2) ||
 	     c->display_usage ||
@@ -751,8 +751,8 @@ static int net_groupmap_delmem(struct net_context *c, int argc, const char **arg
 
 static int net_groupmap_listmem(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID alias;
-	DOM_SID *members;
+	struct dom_sid alias;
+	struct dom_sid *members;
 	size_t i, num;
 
 	if ( (argc != 1) ||
@@ -784,8 +784,8 @@ static int net_groupmap_listmem(struct net_context *c, int argc, const char **ar
 }
 
 static bool print_alias_memberships(TALLOC_CTX *mem_ctx,
-				    const DOM_SID *domain_sid,
-				    const DOM_SID *member)
+				    const struct dom_sid *domain_sid,
+				    const struct dom_sid *member)
 {
 	uint32 *alias_rids;
 	size_t i, num_alias_rids;
@@ -802,7 +802,7 @@ static bool print_alias_memberships(TALLOC_CTX *mem_ctx,
 	}
 
 	for (i = 0; i < num_alias_rids; i++) {
-		DOM_SID alias;
+		struct dom_sid alias;
 		sid_compose(&alias, domain_sid, alias_rids[i]);
 		printf("%s\n", sid_string_tos(&alias));
 	}
@@ -813,7 +813,7 @@ static bool print_alias_memberships(TALLOC_CTX *mem_ctx,
 static int net_groupmap_memberships(struct net_context *c, int argc, const char **argv)
 {
 	TALLOC_CTX *mem_ctx;
-	DOM_SID *domain_sid, member;
+	struct dom_sid *domain_sid, member;
 
 	if ( (argc != 1) ||
 	     c->display_usage ||
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index 32680e0dee..1400e31174 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -333,7 +333,7 @@ static int net_idmap_aclmapset(struct net_context *c, int argc, const char **arg
 {
 	TALLOC_CTX *mem_ctx;
 	int result = -1;
-	DOM_SID src_sid, dst_sid;
+	struct dom_sid src_sid, dst_sid;
 	char *src, *dst;
 	struct db_context *db;
 	struct db_record *rec;
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 25c781f2c4..585a1185e6 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -321,7 +321,7 @@ static int net_lookup_kdc(struct net_context *c, int argc, const char **argv)
 static int net_lookup_name(struct net_context *c, int argc, const char **argv)
 {
 	const char *dom, *name;
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 
 	if (argc != 1) {
@@ -345,7 +345,7 @@ static int net_lookup_name(struct net_context *c, int argc, const char **argv)
 static int net_lookup_sid(struct net_context *c, int argc, const char **argv)
 {
 	const char *dom, *name;
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 
 	if (argc != 1) {
diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index eaea71e58f..c7a262433e 100644
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -596,7 +596,7 @@ static NTSTATUS migrate_secdesc(TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS printing_migrate_internal(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,
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 4cfd148309..9f3fe155a4 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -26,16 +26,16 @@
 
 /* The following definitions come from auth/token_util.c  */
 
-bool nt_token_check_sid ( const DOM_SID *sid, const NT_USER_TOKEN *token );
+bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token );
 bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid );
 NT_USER_TOKEN *get_root_nt_token( void );
-NTSTATUS add_aliases(const DOM_SID *domain_sid,
+NTSTATUS add_aliases(const struct dom_sid *domain_sid,
 		     struct nt_user_token *token);
 struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
-					    const DOM_SID *user_sid,
+					    const struct dom_sid *user_sid,
 					    bool is_guest,
 					    int num_groupsids,
-					    const DOM_SID *groupsids);
+					    const struct dom_sid *groupsids);
 void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token);
 void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
 			   int n_groups, gid_t *groups);
@@ -154,7 +154,7 @@ int net_registry(struct net_context *c, int argc, const char **argv);
 /* The following definitions come from utils/net_rpc.c  */
 
 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);
 int run_rpc_command(struct net_context *c,
 			struct cli_state *cli_arg,
@@ -166,7 +166,7 @@ int run_rpc_command(struct net_context *c,
 int net_rpc_changetrustpw(struct net_context *c, int argc, const char **argv);
 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,
@@ -193,7 +193,7 @@ struct rpc_sh_cmd *net_rpc_share_cmds(struct net_context *c, TALLOC_CTX *mem_ctx
 				      struct rpc_sh_ctx *ctx);
 int net_rpc_file(struct net_context *c, int argc, const char **argv);
 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,
@@ -201,7 +201,7 @@ NTSTATUS rpc_init_shutdown_internals(struct net_context *c,
 				     int argc,
 				     const char **argv);
 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,
@@ -242,7 +242,7 @@ NTSTATUS net_copy_file(struct net_context *c,
 		       bool copy_acls, bool copy_attrs,
 		       bool copy_timestamps, bool is_file);
 NTSTATUS rpc_printer_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,
@@ -250,7 +250,7 @@ NTSTATUS rpc_printer_list_internals(struct net_context *c,
 					int argc,
 					const char **argv);
 NTSTATUS rpc_printer_driver_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,
@@ -258,7 +258,7 @@ NTSTATUS rpc_printer_driver_list_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_publish_publish_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,
@@ -266,7 +266,7 @@ NTSTATUS rpc_printer_publish_publish_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_publish_unpublish_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,
@@ -274,7 +274,7 @@ NTSTATUS rpc_printer_publish_unpublish_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_publish_update_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,
@@ -282,7 +282,7 @@ NTSTATUS rpc_printer_publish_update_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_publish_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,
@@ -290,7 +290,7 @@ NTSTATUS rpc_printer_publish_list_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_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,
@@ -298,7 +298,7 @@ NTSTATUS rpc_printer_migrate_security_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_migrate_forms_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,
@@ -306,7 +306,7 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_migrate_drivers_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,
@@ -314,7 +314,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_migrate_printers_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,
@@ -322,7 +322,7 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c,
 						int argc,
 						const char **argv);
 NTSTATUS rpc_printer_migrate_settings_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,
@@ -343,7 +343,7 @@ struct rpc_sh_cmd *net_rpc_rights_cmds(struct net_context *c, TALLOC_CTX *mem_ct
 /* The following definitions come from utils/net_rpc_samsync.c  */
 
 NTSTATUS rpc_samdump_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,
@@ -352,7 +352,7 @@ NTSTATUS rpc_samdump_internals(struct net_context *c,
 				const char **argv);
 int rpc_vampire_usage(struct net_context *c, int argc, const char **argv);
 NTSTATUS rpc_vampire_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,
@@ -362,7 +362,7 @@ NTSTATUS rpc_vampire_internals(struct net_context *c,
 int rpc_vampire_passdb(struct net_context *c, int argc, const char **argv);
 int rpc_vampire_ldif(struct net_context *c, int argc, const char **argv);
 NTSTATUS rpc_vampire_ldif_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,
@@ -370,7 +370,7 @@ NTSTATUS rpc_vampire_ldif_internals(struct net_context *c,
 				    int argc,
 				    const char **argv);
 NTSTATUS rpc_vampire_keytab_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,
@@ -440,7 +440,7 @@ int net_serverid(struct net_context *c, int argc, const char **argv);
 NTSTATUS net_rpc_lookup_name(struct net_context *c,
 			     TALLOC_CTX *mem_ctx, struct cli_state *cli,
 			     const char *name, const char **ret_domain,
-			     const char **ret_name, DOM_SID *ret_sid,
+			     const char **ret_name, struct dom_sid *ret_sid,
 			     enum lsa_SidType *ret_type);
 NTSTATUS connect_to_service(struct net_context *c,
 					struct cli_state **cli_ctx,
@@ -494,11 +494,11 @@ NTSTATUS net_scan_dc(struct net_context *c,
 
 NTSTATUS net_lookup_name_from_sid(struct net_context *c,
 				TALLOC_CTX *ctx,
-				DOM_SID *psid,
+				struct dom_sid *psid,
 				const char **ppdomain,
 				const char **ppname);
 NTSTATUS net_lookup_sid_from_name(struct net_context *c, TALLOC_CTX *ctx,
-				  const char *full_name, DOM_SID *pret_sid);
+				  const char *full_name, struct dom_sid *pret_sid);
 
 /* The following definitions come from utils/passwd_util.c  */
 
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 9a88a82219..773663fb47 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -62,7 +62,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;
@@ -131,7 +131,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;
 
@@ -244,7 +244,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,
@@ -312,7 +312,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,
@@ -491,7 +491,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,
@@ -588,7 +588,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,
@@ -1106,7 +1106,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;
 
@@ -1495,7 +1495,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,
@@ -1781,10 +1781,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;
@@ -1822,7 +1822,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);
@@ -1836,7 +1836,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;
@@ -1847,7 +1847,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);
 
@@ -1911,7 +1911,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;
@@ -1919,10 +1919,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);
 
@@ -1982,7 +1982,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,
@@ -1990,7 +1990,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) {
@@ -2048,7 +2048,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;
@@ -2059,7 +2059,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);
 
@@ -2117,7 +2117,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;
@@ -2125,10 +2125,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);
 
@@ -2185,7 +2185,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,
@@ -2193,7 +2193,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) {
@@ -2265,7 +2265,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,
@@ -2500,7 +2500,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)
 {
@@ -2583,7 +2583,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;
@@ -2632,7 +2632,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);
@@ -2675,7 +2675,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,
@@ -2722,7 +2722,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);
 
@@ -3224,7 +3224,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,
@@ -3529,7 +3529,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,
@@ -3687,7 +3687,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,
@@ -3897,9 +3897,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;
@@ -3925,7 +3925,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;
@@ -3982,7 +3982,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],
@@ -4009,7 +4009,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,
@@ -4075,7 +4075,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,
@@ -4108,11 +4108,11 @@ 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(NT_USER_TOKEN *token, struct dom_sid *user_sid)
 {
 	token->num_sids = 4;
 
-	if (!(token->user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4))) {
+	if (!(token->user_sids = SMB_MALLOC_ARRAY(struct dom_sid, 4))) {
 		d_fprintf(stderr, "malloc %s\n",_("failed"));
 		token->num_sids = 0;
 		return;
@@ -4129,12 +4129,12 @@ static void free_user_token(NT_USER_TOKEN *token)
 	SAFE_FREE(token->user_sids);
 }
 
-static void add_sid_to_token(NT_USER_TOKEN *token, DOM_SID *sid)
+static void add_sid_to_token(NT_USER_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);
+	token->user_sids = SMB_REALLOC_ARRAY(token->user_sids, struct dom_sid, token->num_sids+1);
 	if (!token->user_sids) {
 		return;
 	}
@@ -4160,7 +4160,7 @@ static void dump_user_token(struct user_token *token)
 	}
 }
 
-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;
 
@@ -4172,7 +4172,7 @@ static bool is_alias_member(DOM_SID *sid, struct full_alias *alias)
 	return false;
 }
 
-static void collect_sid_memberships(NT_USER_TOKEN *token, DOM_SID sid)
+static void collect_sid_memberships(NT_USER_TOKEN *token, struct dom_sid sid)
 {
 	int i;
 
@@ -4206,7 +4206,7 @@ static bool get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *t
 	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;
@@ -4256,7 +4256,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)) {
@@ -4375,7 +4375,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]));
@@ -4539,7 +4539,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,
@@ -5054,7 +5054,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,
@@ -5093,7 +5093,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,
@@ -5169,7 +5169,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,
@@ -5223,7 +5223,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,
@@ -5320,7 +5320,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,
@@ -5481,7 +5481,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,
@@ -5492,7 +5492,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;
 
@@ -5687,7 +5687,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;
@@ -5890,7 +5890,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,
@@ -5906,7 +5906,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;
 
@@ -5919,7 +5919,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;
@@ -5985,7 +5985,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;
 
@@ -6138,7 +6138,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;
diff --git a/source3/utils/net_rpc_audit.c b/source3/utils/net_rpc_audit.c
index 90d30a6084..68b0d93c6c 100644
--- a/source3/utils/net_rpc_audit.c
+++ b/source3/utils/net_rpc_audit.c
@@ -56,7 +56,7 @@ static void print_auditing_category(const char *policy, const char *value)
 ********************************************************************/
 
 static NTSTATUS rpc_audit_get_internal(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,
@@ -124,7 +124,7 @@ static NTSTATUS rpc_audit_get_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_audit_set_internal(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,
@@ -265,7 +265,7 @@ static NTSTATUS rpc_audit_enable_internal_ext(struct rpc_pipe_client *pipe_hnd,
 ********************************************************************/
 
 static NTSTATUS rpc_audit_disable_internal(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,
@@ -281,7 +281,7 @@ static NTSTATUS rpc_audit_disable_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_audit_enable_internal(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,
@@ -297,7 +297,7 @@ static NTSTATUS rpc_audit_enable_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_audit_list_internal(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,
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 742b71e194..4659fe52ec 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -150,7 +150,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
 	/* rpc variables */
 
 	struct policy_handle lsa_pol, sam_pol, domain_pol, user_pol;
-	DOM_SID *domain_sid;
+	struct dom_sid *domain_sid;
 	uint32 user_rid;
 
 	/* Password stuff */
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index ec6509497a..8c7585a837 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -1126,7 +1126,7 @@ out:
  **/
 
 NTSTATUS rpc_printer_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,
@@ -1178,7 +1178,7 @@ NTSTATUS rpc_printer_list_internals(struct net_context *c,
  **/
 
 NTSTATUS rpc_printer_driver_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,
@@ -1336,7 +1336,7 @@ done:
 }
 
 NTSTATUS rpc_printer_publish_publish_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,
@@ -1348,7 +1348,7 @@ NTSTATUS rpc_printer_publish_publish_internals(struct net_context *c,
 }
 
 NTSTATUS rpc_printer_publish_unpublish_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,
@@ -1360,7 +1360,7 @@ NTSTATUS rpc_printer_publish_unpublish_internals(struct net_context *c,
 }
 
 NTSTATUS rpc_printer_publish_update_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,
@@ -1389,7 +1389,7 @@ NTSTATUS rpc_printer_publish_update_internals(struct net_context *c,
  **/
 
 NTSTATUS rpc_printer_publish_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,
@@ -1481,7 +1481,7 @@ done:
  **/
 
 NTSTATUS rpc_printer_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,
@@ -1629,7 +1629,7 @@ done:
  **/
 
 NTSTATUS rpc_printer_migrate_forms_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,
@@ -1792,7 +1792,7 @@ done:
  **/
 
 NTSTATUS rpc_printer_migrate_drivers_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,
@@ -2003,7 +2003,7 @@ done:
  **/
 
 NTSTATUS rpc_printer_migrate_printers_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,
@@ -2160,7 +2160,7 @@ done:
  **/
 
 NTSTATUS rpc_printer_migrate_settings_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,
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 907358163e..f03c346feb 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -411,7 +411,7 @@ static NTSTATUS registry_setvalue(TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS rpc_registry_setvalue_internal(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,
@@ -483,7 +483,7 @@ static int rpc_registry_setvalue(struct net_context *c, int argc,
 }
 
 static NTSTATUS rpc_registry_deletevalue_internal(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,
@@ -537,7 +537,7 @@ static int rpc_registry_deletevalue(struct net_context *c, int argc,
 }
 
 static NTSTATUS rpc_registry_getvalue_internal(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,
@@ -625,7 +625,7 @@ done:
 }
 
 static NTSTATUS rpc_registry_getvalue_full(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,
@@ -653,7 +653,7 @@ static int rpc_registry_getvalue(struct net_context *c, int argc,
 }
 
 static NTSTATUS rpc_registry_getvalue_raw(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,
@@ -681,7 +681,7 @@ static int rpc_registry_getvalueraw(struct net_context *c, int argc,
 }
 
 static NTSTATUS rpc_registry_createkey_internal(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,
@@ -755,7 +755,7 @@ static int rpc_registry_createkey(struct net_context *c, int argc,
 }
 
 static NTSTATUS rpc_registry_deletekey_internal(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,
@@ -809,7 +809,7 @@ static int rpc_registry_deletekey(struct net_context *c, int argc, const char **
 ********************************************************************/
 
 static NTSTATUS rpc_registry_enumerate_internal(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,
@@ -887,7 +887,7 @@ static int rpc_registry_enumerate(struct net_context *c, int argc,
 ********************************************************************/
 
 static NTSTATUS rpc_registry_save_internal(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,
@@ -1189,7 +1189,7 @@ out:
 ********************************************************************/
 
 static NTSTATUS rpc_registry_getsd_internal(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,
diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 6b7ca7ec4f..3dc3f85ffb 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -27,7 +27,7 @@
 
 static NTSTATUS sid_to_name(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
-				DOM_SID *sid,
+				struct dom_sid *sid,
 				fstring name)
 {
 	struct policy_handle pol;
@@ -59,12 +59,12 @@ static NTSTATUS sid_to_name(struct rpc_pipe_client *pipe_hnd,
 
 static NTSTATUS name_to_sid(struct rpc_pipe_client *pipe_hnd,
 			    TALLOC_CTX *mem_ctx,
-			    DOM_SID *sid, const char *name)
+			    struct dom_sid *sid, const char *name)
 {
 	struct policy_handle pol;
 	enum lsa_SidType *sid_types;
 	NTSTATUS result;
-	DOM_SID *sids;
+	struct dom_sid *sids;
 
 	/* maybe its a raw SID */
 	if ( strncmp(name, "S-", 2) == 0 && string_to_sid(sid, name) ) {
@@ -151,7 +151,7 @@ static NTSTATUS enum_privileges(struct rpc_pipe_client *pipe_hnd,
 static NTSTATUS check_privilege_for_user(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *ctx,
 					struct policy_handle *pol,
-					DOM_SID *sid,
+					struct dom_sid *sid,
 					const char *right)
 {
 	NTSTATUS result;
@@ -186,7 +186,7 @@ static NTSTATUS check_privilege_for_user(struct rpc_pipe_client *pipe_hnd,
 static NTSTATUS enum_privileges_for_user(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *ctx,
 					struct policy_handle *pol,
-					DOM_SID *sid )
+					struct dom_sid *sid )
 {
 	NTSTATUS result;
 	struct lsa_RightSet rights;
@@ -311,7 +311,7 @@ static NTSTATUS enum_privileges_for_accounts(struct rpc_pipe_client *pipe_hnd,
 ********************************************************************/
 
 static NTSTATUS rpc_rights_list_internal(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,
@@ -321,7 +321,7 @@ static NTSTATUS rpc_rights_list_internal(struct net_context *c,
 {
 	struct policy_handle pol;
 	NTSTATUS result;
-	DOM_SID sid;
+	struct dom_sid sid;
 	fstring privname;
 	struct lsa_String lsa_name;
 	struct lsa_StringLarge *description = NULL;
@@ -436,7 +436,7 @@ done:
 ********************************************************************/
 
 static NTSTATUS rpc_rights_grant_internal(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,
@@ -449,7 +449,7 @@ static NTSTATUS rpc_rights_grant_internal(struct net_context *c,
 	struct lsa_RightSet rights;
 	int i;
 
-	DOM_SID sid;
+	struct dom_sid sid;
 
 	if (argc < 2 ) {
 		d_printf("%s\n%s",
@@ -508,7 +508,7 @@ static NTSTATUS rpc_rights_grant_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_rights_revoke_internal(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,
@@ -519,7 +519,7 @@ static NTSTATUS rpc_rights_revoke_internal(struct net_context *c,
 	struct policy_handle dom_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	struct lsa_RightSet rights;
-	DOM_SID sid;
+	struct dom_sid sid;
 	int i;
 
 	if (argc < 2 ) {
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 85bdc75cfb..ae1a71b689 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -105,7 +105,7 @@ static void parse_samsync_partial_replication_objects(TALLOC_CTX *mem_ctx,
 
 /* dump sam database via samsync rpc calls */
 NTSTATUS rpc_samdump_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,
@@ -174,7 +174,7 @@ int rpc_vampire_usage(struct net_context *c, int argc, const char **argv)
 
 /* dump sam database via samsync rpc calls */
 NTSTATUS rpc_vampire_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,
@@ -267,7 +267,7 @@ int rpc_vampire_passdb(struct net_context *c, int argc, const char **argv)
 }
 
 NTSTATUS rpc_vampire_ldif_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,
@@ -352,7 +352,7 @@ int rpc_vampire_ldif(struct net_context *c, int argc, const char **argv)
 
 
 NTSTATUS rpc_vampire_keytab_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,
@@ -412,7 +412,7 @@ NTSTATUS rpc_vampire_keytab_internals(struct net_context *c,
 }
 
 static NTSTATUS rpc_vampire_keytab_ds_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,
diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 3010305838..9ab82b5adf 100644
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -194,7 +194,7 @@ done:
 ********************************************************************/
 
 static NTSTATUS rpc_service_list_internal(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,
@@ -307,7 +307,7 @@ static NTSTATUS rpc_service_list_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_service_status_internal(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,
@@ -442,7 +442,7 @@ done:
 ********************************************************************/
 
 static NTSTATUS rpc_service_stop_internal(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 +488,7 @@ static NTSTATUS rpc_service_stop_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_service_pause_internal(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,
@@ -534,7 +534,7 @@ static NTSTATUS rpc_service_pause_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_service_resume_internal(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,
@@ -580,7 +580,7 @@ static NTSTATUS rpc_service_resume_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_service_start_internal(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,
@@ -661,7 +661,7 @@ done:
 ********************************************************************/
 
 static NTSTATUS rpc_service_delete_internal(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,
@@ -736,7 +736,7 @@ static NTSTATUS rpc_service_delete_internal(struct net_context *c,
 ********************************************************************/
 
 static NTSTATUS rpc_service_create_internal(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,
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 9b842aedd3..311cdd591b 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -31,7 +31,7 @@ static int net_sam_userset(struct net_context *c, int argc, const char **argv,
 				      enum pdb_value_state))
 {
 	struct samu *sam_acct = NULL;
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
@@ -134,7 +134,7 @@ static int net_sam_set_userflag(struct net_context *c, int argc,
 				uint16 flag)
 {
 	struct samu *sam_acct = NULL;
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
@@ -227,7 +227,7 @@ static int net_sam_set_pwdmustchangenow(struct net_context *c, int argc,
 					const char **argv)
 {
 	struct samu *sam_acct = NULL;
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
@@ -293,7 +293,7 @@ static int net_sam_set_comment(struct net_context *c, int argc,
 			       const char **argv)
 {
 	GROUP_MAP map;
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
@@ -655,7 +655,7 @@ static int net_sam_rights_list(struct net_context *c, int argc,
 	}
 
 	if (se_priv_from_name(argv[0], &mask)) {
-		DOM_SID *sids;
+		struct dom_sid *sids;
 		int i, num_sids;
 		NTSTATUS status;
 
@@ -688,7 +688,7 @@ static int net_sam_rights_list(struct net_context *c, int argc,
 static int net_sam_rights_grant(struct net_context *c, int argc,
 				const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 	SE_PRIV mask;
@@ -727,7 +727,7 @@ static int net_sam_rights_grant(struct net_context *c, int argc,
 static int net_sam_rights_revoke(struct net_context *c, int argc,
 				const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 	SE_PRIV mask;
@@ -896,7 +896,7 @@ static NTSTATUS unmap_unix_group(const struct group *grp, GROUP_MAP *pmap)
 {
         GROUP_MAP map;
         const char *grpname;
-        DOM_SID dom_sid;
+        struct dom_sid dom_sid;
 
         map.gid = grp->gr_gid;
         grpname = grp->gr_name;
@@ -986,7 +986,7 @@ static int net_sam_createdomaingroup(struct net_context *c, int argc,
 static int net_sam_deletedomaingroup(struct net_context *c, int argc,
 				     const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	uint32_t rid;
         enum lsa_SidType type;
         const char *dom, *name;
@@ -1067,7 +1067,7 @@ static int net_sam_createlocalgroup(struct net_context *c, int argc, const char
 
 static int net_sam_deletelocalgroup(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
         enum lsa_SidType type;
         const char *dom, *name;
 	NTSTATUS status;
@@ -1114,7 +1114,7 @@ static int net_sam_createbuiltingroup(struct net_context *c, int argc, const cha
 	uint32 rid;
 	enum lsa_SidType type;
 	fstring groupname;
-	DOM_SID sid;
+	struct dom_sid sid;
 
 	if (argc != 1 || c->display_usage) {
 		d_fprintf(stderr, "%s\n%s",
@@ -1166,7 +1166,7 @@ static int net_sam_createbuiltingroup(struct net_context *c, int argc, const cha
 static int net_sam_addmem(struct net_context *c, int argc, const char **argv)
 {
 	const char *groupdomain, *groupname, *memberdomain, *membername;
-	DOM_SID group, member;
+	struct dom_sid group, member;
 	enum lsa_SidType grouptype, membertype;
 	NTSTATUS status;
 
@@ -1255,7 +1255,7 @@ static int net_sam_delmem(struct net_context *c, int argc, const char **argv)
 	const char *groupdomain, *groupname;
 	const char *memberdomain = NULL;
 	const char *membername = NULL;
-	DOM_SID group, member;
+	struct dom_sid group, member;
 	enum lsa_SidType grouptype;
 	NTSTATUS status;
 
@@ -1327,8 +1327,8 @@ static int net_sam_delmem(struct net_context *c, int argc, const char **argv)
 static int net_sam_listmem(struct net_context *c, int argc, const char **argv)
 {
 	const char *groupdomain, *groupname;
-	DOM_SID group;
-	DOM_SID *members = NULL;
+	struct dom_sid group;
+	struct dom_sid *members = NULL;
 	size_t i, num_members = 0;
 	enum lsa_SidType grouptype;
 	NTSTATUS status;
@@ -1539,7 +1539,7 @@ static int net_sam_list(struct net_context *c, int argc, const char **argv)
 
 static int net_sam_show(struct net_context *c, int argc, const char **argv)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 
@@ -1577,7 +1577,7 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv)
 	char *p;
 	struct smbldap_state *ls;
 	GROUP_MAP gmap;
-	DOM_SID gsid;
+	struct dom_sid gsid;
 	gid_t domusers_gid = -1;
 	gid_t domadmins_gid = -1;
 	struct samu *samuser;
@@ -1761,7 +1761,7 @@ doma_done:
 
 	if (!pdb_getsampwnam(samuser, "Administrator")) {
 		LDAPMod **mods = NULL;
-		DOM_SID sid;
+		struct dom_sid sid;
 		char *dn;
 		char *name;
 		char *uidstr;
@@ -1843,7 +1843,7 @@ doma_done:
 
 	if (!pdb_getsampwnam(samuser, lp_guestaccount())) {
 		LDAPMod **mods = NULL;
-		DOM_SID sid;
+		struct dom_sid sid;
 		char *dn;
 		char *uidstr;
 		char *gidstr;
diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index c005268d0b..bbaf39a6e4 100644
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -806,7 +806,7 @@ static int net_usershare_add(struct net_context *c, int argc, const char **argv)
 	num_aces += count_chars(pacl,',');
 
 	for (i = 0; i < num_aces; i++) {
-		DOM_SID sid;
+		struct dom_sid sid;
 		const char *pcolon = strchr_m(pacl, ':');
 		const char *name;
 
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 191bc52c6b..b6ab03d913 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -28,14 +28,14 @@
 NTSTATUS net_rpc_lookup_name(struct net_context *c,
 			     TALLOC_CTX *mem_ctx, struct cli_state *cli,
 			     const char *name, const char **ret_domain,
-			     const char **ret_name, DOM_SID *ret_sid,
+			     const char **ret_name, struct dom_sid *ret_sid,
 			     enum lsa_SidType *ret_type)
 {
 	struct rpc_pipe_client *lsa_pipe = NULL;
 	struct policy_handle pol;
 	NTSTATUS result = NT_STATUS_OK;
 	const char **dom_names;
-	DOM_SID *sids;
+	struct dom_sid *sids;
 	enum lsa_SidType *types;
 
 	ZERO_STRUCT(pol);
diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index a49583d9e5..ef254beb24 100644
--- a/source3/utils/netlookup.c
+++ b/source3/utils/netlookup.c
@@ -157,7 +157,7 @@ static struct con_struct *create_cs(struct net_context *c,
 
 NTSTATUS net_lookup_name_from_sid(struct net_context *c,
 				TALLOC_CTX *ctx,
-				DOM_SID *psid,
+				struct dom_sid *psid,
 				const char **ppdomain,
 				const char **ppname)
 {
@@ -199,11 +199,11 @@ NTSTATUS net_lookup_name_from_sid(struct net_context *c,
 ********************************************************/
 
 NTSTATUS net_lookup_sid_from_name(struct net_context *c, TALLOC_CTX *ctx,
-				  const char *full_name, DOM_SID *pret_sid)
+				  const char *full_name, struct dom_sid *pret_sid)
 {
 	NTSTATUS nt_status;
 	struct con_struct *csp = NULL;
-	DOM_SID *sids = NULL;
+	struct dom_sid *sids = NULL;
 	enum lsa_SidType *types = NULL;
 
 	csp = create_cs(c, ctx, &nt_status);
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 4fc10e2423..c6ccbc86a2 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -55,7 +55,7 @@
 #define MASK_ALWAYS_GOOD	0x0000001F
 #define MASK_USER_GOOD		0x60405FE0
 
-static int get_sid_from_cli_string(DOM_SID *sid, const char *str_sid)
+static int get_sid_from_cli_string(struct dom_sid *sid, const char *str_sid)
 {
 	uint32_t rid;
 
@@ -103,7 +103,7 @@ static int export_database (struct pdb_methods *in,
 	while (u_search->next_entry(u_search, &userentry)) {
 		struct samu *user;
 		struct samu *account;
-		DOM_SID user_sid;
+		struct dom_sid user_sid;
 
 		DEBUG(4, ("Processing account %s\n", userentry.account_name));
 
@@ -376,7 +376,7 @@ static int print_users_list(bool verbosity, bool smbpwdstyle)
 	struct samr_displayentry userentry;
 	struct samu *sam_pwent;
 	TALLOC_CTX *tosctx;
-	DOM_SID user_sid;
+	struct dom_sid user_sid;
 	bool bret;
 	int ret;
 
@@ -434,7 +434,7 @@ static int fix_users_list(void)
 	struct samr_displayentry userentry;
 	struct samu *sam_pwent;
 	TALLOC_CTX *tosctx;
-	DOM_SID user_sid;
+	struct dom_sid user_sid;
 	NTSTATUS status;
 	bool bret;
 	int ret;
@@ -504,7 +504,7 @@ static int set_user_info(const char *username, const char *fullname,
 	uint32_t acb_flags;
 	uint32_t not_settable;
 	uint32_t new_flags;
-	DOM_SID u_sid;
+	struct dom_sid u_sid;
 	bool ret;
 
 	sam_pwent = samu_new(NULL);
@@ -618,7 +618,7 @@ static int set_machine_info(const char *machinename,
 	uint32_t acb_flags;
 	uint32_t not_settable;
 	uint32_t new_flags;
-	DOM_SID m_sid;
+	struct dom_sid m_sid;
 	char *name;
 	int len;
 	bool ret;
@@ -709,7 +709,7 @@ static int new_user(const char *username, const char *fullname,
 	struct samu *sam_pwent = NULL;
 	TALLOC_CTX *tosctx;
 	NTSTATUS status;
-	DOM_SID u_sid;
+	struct dom_sid u_sid;
 	int flags;
 	int ret;
 
@@ -806,7 +806,7 @@ static int new_machine(const char *machinename, char *machine_sid)
 	struct samu *sam_pwent = NULL;
 	TALLOC_CTX *tosctx;
 	NTSTATUS status;
-	DOM_SID m_sid;
+	struct dom_sid m_sid;
 	char *compatpwd;
 	char *name;
 	int flags;
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index a987f315d1..e4ed8f50ec 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -25,7 +25,7 @@
 
 /* GLOBAL VARIABLES */
 
-DOM_SID old_sid, new_sid;
+struct dom_sid old_sid, new_sid;
 int change = 0, new_val = 0;
 int opt_verbose = False;
 
@@ -56,7 +56,7 @@ static void verbose_output(const char *format, ...)
 /********************************************************************
 ********************************************************************/
 
-static bool swap_sid_in_acl( struct security_descriptor *sd, DOM_SID *s1, DOM_SID *s2 )
+static bool swap_sid_in_acl( struct security_descriptor *sd, struct dom_sid *s1, struct dom_sid *s2 )
 {
 	struct security_acl *theacl;
 	int i;
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 07f0e456e3..a29995b87b 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -157,7 +157,7 @@ static bool parse_ace(struct security_ace *ace, const char *orig_str)
 	unsigned int atype = 0;
 	unsigned int aflags = 0;
 	unsigned int amask = 0;
-	DOM_SID sid;
+	struct dom_sid sid;
 	uint32_t mask;
 	const struct perm_value *v;
 	char *str = SMB_STRDUP(orig_str);
@@ -599,7 +599,7 @@ int main(int argc, const char *argv[])
 	/* check for initializing secrets.tdb first */
 
 	if ( initialize_sid ) {
-		DOM_SID *sid = get_global_sam_sid();
+		struct dom_sid *sid = get_global_sam_sid();
 
 		if ( !sid ) {
 			fprintf( stderr, "Failed to retrieve Machine SID!\n");
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 11ced83bf6..0c7a72263a 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -68,7 +68,7 @@ static const struct perm_value standard_values[] = {
 /* Open cli connection and policy handle */
 
 static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
-				   const DOM_SID *sid,
+				   const struct dom_sid *sid,
 				   TALLOC_CTX *mem_ctx,
 				   enum lsa_SidType *type,
 				   char **domain, char **name)
@@ -121,14 +121,14 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
 static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
 				    const char *name,
 				    enum lsa_SidType *type,
-				    DOM_SID *sid)
+				    struct dom_sid *sid)
 {
 	uint16 orig_cnum = cli->cnum;
 	struct rpc_pipe_client *p;
 	struct policy_handle handle;
 	NTSTATUS status;
 	TALLOC_CTX *frame = talloc_stackframe();
-	DOM_SID *sids;
+	struct dom_sid *sids;
 	enum lsa_SidType *types;
 
 	status = cli_tcon_andx(cli, "IPC$", "?????", "", 0);
@@ -167,7 +167,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
 }
 
 /* convert a SID to a string, either numeric or username/group */
-static void SidToString(struct cli_state *cli, fstring str, const DOM_SID *sid)
+static void SidToString(struct cli_state *cli, fstring str, const struct dom_sid *sid)
 {
 	char *domain = NULL;
 	char *name = NULL;
@@ -196,7 +196,7 @@ static void SidToString(struct cli_state *cli, fstring str, const DOM_SID *sid)
 }
 
 /* convert a string to a SID, either numeric or username/group */
-static bool StringToSid(struct cli_state *cli, DOM_SID *sid, const char *str)
+static bool StringToSid(struct cli_state *cli, struct dom_sid *sid, const char *str)
 {
 	enum lsa_SidType type;
 
@@ -373,7 +373,7 @@ static bool parse_ace(struct cli_state *cli, struct security_ace *ace,
 	unsigned int atype = 0;
 	unsigned int aflags = 0;
 	unsigned int amask = 0;
-	DOM_SID sid;
+	struct dom_sid sid;
 	uint32_t mask;
 	const struct perm_value *v;
 	char *str = SMB_STRDUP(orig_str);
@@ -559,7 +559,7 @@ static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct cli_st
 	char *tok;
 	struct security_descriptor *ret = NULL;
 	size_t sd_size;
-	DOM_SID *grp_sid=NULL, *owner_sid=NULL;
+	struct dom_sid *grp_sid=NULL, *owner_sid=NULL;
 	struct security_acl *dacl=NULL;
 	int revision=1;
 
@@ -574,7 +574,7 @@ static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct cli_st
 				printf("Only specify owner once\n");
 				goto done;
 			}
-			owner_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+			owner_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
 			if (!owner_sid ||
 			    !StringToSid(cli, owner_sid, tok+6)) {
 				printf("Failed to parse owner sid\n");
@@ -588,7 +588,7 @@ static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct cli_st
 				printf("Only specify group once\n");
 				goto done;
 			}
-			grp_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+			grp_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
 			if (!grp_sid ||
 			    !StringToSid(cli, grp_sid, tok+6)) {
 				printf("Failed to parse group sid\n");
@@ -782,7 +782,7 @@ because the NT docs say this can't be done :-). JRA.
 static int owner_set(struct cli_state *cli, enum chown_mode change_mode, 
 			const char *filename, const char *new_username)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	struct security_descriptor *sd, *old;
 	size_t sd_size;
 
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index a494c3f4aa..3f98b12503 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -79,7 +79,7 @@ static bool cli_open_policy_hnd(void)
 }
 
 /* convert a SID to a string, either numeric or username/group */
-static void SidToString(fstring str, DOM_SID *sid, bool _numeric)
+static void SidToString(fstring str, struct dom_sid *sid, bool _numeric)
 {
 	char **domains = NULL;
 	char **names = NULL;
@@ -108,10 +108,10 @@ static void SidToString(fstring str, DOM_SID *sid, bool _numeric)
 }
 
 /* convert a string to a SID, either numeric or username/group */
-static bool StringToSid(DOM_SID *sid, const char *str)
+static bool StringToSid(struct dom_sid *sid, const char *str)
 {
 	enum lsa_SidType *types = NULL;
-	DOM_SID *sids = NULL;
+	struct dom_sid *sids = NULL;
 	bool result = True;
 
 	if (strncmp(str, "S-", 2) == 0) {