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>

1 files changed, 19 insertions, 19 deletions

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 9b842aedd34..311cdd591b6 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;