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>

6 files changed, 25 insertions, 25 deletions

diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index ca530a8583..1b72e33303 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -131,7 +131,7 @@ bool send_getdc_request(TALLOC_CTX *mem_ctx,
 			struct messaging_context *msg_ctx,
 			struct sockaddr_storage *dc_ss,
 			const char *domain_name,
-			const DOM_SID *sid,
+			const struct dom_sid *sid,
 			uint32_t nt_version)
 {
 	struct in_addr dc_ip;
diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index e15d5df24d..3cd4edf165 100644
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -568,7 +568,7 @@ static const char *quota_str_static(uint64_t val, bool special, bool _numeric)
 	return result;
 }
 
-void dump_ntquota(SMB_NTQUOTA_STRUCT *qt, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, DOM_SID *sid, bool _numeric))
+void dump_ntquota(SMB_NTQUOTA_STRUCT *qt, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, struct dom_sid *sid, bool _numeric))
 {
 	TALLOC_CTX *frame = talloc_stackframe();
 
@@ -621,7 +621,7 @@ void dump_ntquota(SMB_NTQUOTA_STRUCT *qt, bool _verbose, bool _numeric, void (*_
 	return;
 }
 
-void dump_ntquota_list(SMB_NTQUOTA_LIST **qtl, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, DOM_SID *sid, bool _numeric))
+void dump_ntquota_list(SMB_NTQUOTA_LIST **qtl, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, struct dom_sid *sid, bool _numeric))
 {
 	SMB_NTQUOTA_LIST *cur;
 
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 38a9462077..cc87715d8f 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -168,7 +168,7 @@ convert_sid_to_string(struct cli_state *ipc_cli,
                       struct policy_handle *pol,
                       fstring str,
                       bool numeric,
-                      DOM_SID *sid)
+                      struct dom_sid *sid)
 {
 	char **domains = NULL;
 	char **names = NULL;
@@ -212,11 +212,11 @@ static bool
 convert_string_to_sid(struct cli_state *ipc_cli,
                       struct policy_handle *pol,
                       bool numeric,
-                      DOM_SID *sid,
+                      struct dom_sid *sid,
                       const char *str)
 {
 	enum lsa_SidType *types = NULL;
-	DOM_SID *sids = NULL;
+	struct dom_sid *sids = NULL;
 	bool result = True;
 	TALLOC_CTX *ctx = NULL;
 	struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli);
@@ -264,7 +264,7 @@ parse_ace(struct cli_state *ipc_cli,
 	unsigned int atype;
         unsigned int aflags;
         unsigned int amask;
-	DOM_SID sid;
+	struct dom_sid sid;
 	uint32_t mask;
 	const struct perm_value *v;
         struct perm_value {
@@ -427,8 +427,8 @@ sec_desc_parse(TALLOC_CTX *ctx,
 	char *tok;
 	struct security_descriptor *ret = NULL;
 	size_t sd_size;
-	DOM_SID *group_sid=NULL;
-        DOM_SID *owner_sid=NULL;
+	struct dom_sid *group_sid=NULL;
+        struct dom_sid *owner_sid=NULL;
 	struct security_acl *dacl=NULL;
 	int revision=1;
 
@@ -444,7 +444,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 				DEBUG(5,("OWNER specified more than once!\n"));
 				goto done;
 			}
-			owner_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+			owner_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
 			if (!owner_sid ||
 			    !convert_string_to_sid(ipc_cli, pol,
                                                    numeric,
@@ -460,7 +460,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 				DEBUG(5,("OWNER specified more than once!\n"));
 				goto done;
 			}
-			owner_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+			owner_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
 			if (!owner_sid ||
 			    !convert_string_to_sid(ipc_cli, pol,
                                                    False,
@@ -476,7 +476,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 				DEBUG(5,("GROUP specified more than once!\n"));
 				goto done;
 			}
-			group_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+			group_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
 			if (!group_sid ||
 			    !convert_string_to_sid(ipc_cli, pol,
                                                    numeric,
@@ -492,7 +492,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
 				DEBUG(5,("GROUP specified more than once!\n"));
 				goto done;
 			}
-			group_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+			group_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
 			if (!group_sid ||
 			    !convert_string_to_sid(ipc_cli, pol,
                                                    False,
@@ -1504,8 +1504,8 @@ cacl_set(SMBCCTX *context,
         int err = 0;
 	struct security_descriptor *sd = NULL, *old;
         struct security_acl *dacl = NULL;
-	DOM_SID *owner_sid = NULL;
-	DOM_SID *group_sid = NULL;
+	struct dom_sid *owner_sid = NULL;
+	struct dom_sid *group_sid = NULL;
 	uint32 i, j;
 	size_t sd_size;
 	int ret = 0;
diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 738e4b3281..7f096ece76 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -100,7 +100,7 @@ bool netsamlogon_cache_shutdown(void)
 
 void netsamlogon_clear_cached_user(struct netr_SamInfo3 *info3)
 {
-	DOM_SID	user_sid;
+	struct dom_sid	user_sid;
 	fstring keystr, tmp;
 
 	if (!info3) {
@@ -133,7 +133,7 @@ bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3)
 	TDB_DATA data;
 	fstring keystr, tmp;
 	bool result = false;
-	DOM_SID	user_sid;
+	struct dom_sid	user_sid;
 	time_t t = time(NULL);
 	TALLOC_CTX *mem_ctx;
 	DATA_BLOB blob;
@@ -203,7 +203,7 @@ bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3)
  free the user_info struct (malloc()'d memory)
 ***********************************************************************/
 
-struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
+struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const struct dom_sid *user_sid)
 {
 	struct netr_SamInfo3 *info3 = NULL;
 	TDB_DATA data;
@@ -276,7 +276,7 @@ struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *
 #endif
 }
 
-bool netsamlogon_cache_have(const DOM_SID *user_sid)
+bool netsamlogon_cache_have(const struct dom_sid *user_sid)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");
 	struct netr_SamInfo3 *info3 = NULL;
diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c
index eb52b3588d..8c8f05f90e 100644
--- a/source3/libsmb/trustdom_cache.c
+++ b/source3/libsmb/trustdom_cache.c
@@ -95,7 +95,7 @@ static char* trustdom_cache_key(const char* name)
  *         false if store attempt failed
  **/
  
-bool trustdom_cache_store(char* name, char* alt_name, const DOM_SID *sid,
+bool trustdom_cache_store(char* name, char* alt_name, const struct dom_sid *sid,
                           time_t timeout)
 {
 	char *key, *alt_key;
@@ -141,7 +141,7 @@ bool trustdom_cache_store(char* name, char* alt_name, const DOM_SID *sid,
  *         false if has expired/doesn't exist
  **/
 
-bool trustdom_cache_fetch(const char* name, DOM_SID* sid)
+bool trustdom_cache_fetch(const char* name, struct dom_sid* sid)
 {
 	char *key = NULL, *value = NULL;
 	time_t timeout;
@@ -164,7 +164,7 @@ bool trustdom_cache_fetch(const char* name, DOM_SID* sid)
 		DEBUG(5, ("trusted domain %s found (%s)\n", name, value));
 	}
 
-	/* convert sid string representation into DOM_SID structure */
+	/* convert sid string representation into struct dom_sid structure */
 	if(! string_to_sid(sid, value)) {
 		sid = NULL;
 		SAFE_FREE(value);
@@ -252,7 +252,7 @@ void trustdom_cache_flush(void)
 void update_trustdom_cache( void )
 {
 	char **domain_names;
-	DOM_SID *dom_sids;
+	struct dom_sid *dom_sids;
 	uint32 num_domains;
 	uint32 last_check;
 	int time_diff;
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 6e549f4a23..3a2d6d70a1 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -137,7 +137,7 @@ NTSTATUS trust_pw_find_change_and_store_it(struct rpc_pipe_client *cli,
 
 bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
                                      char ***domain_names, uint32 *num_domains,
-				     DOM_SID **sids )
+				     struct dom_sid **sids )
 {
 	struct policy_handle 	pol;
 	NTSTATUS 	result = NT_STATUS_UNSUCCESSFUL;
@@ -202,7 +202,7 @@ bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
 		goto done;
 	}
 
-	*sids = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, *num_domains);
+	*sids = TALLOC_ZERO_ARRAY(mem_ctx, struct dom_sid, *num_domains);
 	if (!*sids) {
 		result = NT_STATUS_NO_MEMORY;
 		goto done;