From 2b8abc030b1eca43f7c0c05dc96eebeb6c492030 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 28 Jun 2006 21:30:21 +0000
Subject: r16644: Fix bug #3887 reported by jason@ncac.gwu.edu by converting
 the lookup_XX functions to correctly return SID_NAME_TYPE enums. Jeremy.
 (This used to be commit ee2b2d96b60c668e37592c79e86c2fd851e15f69)

---
 source3/utils/net_rpc.c        | 6 +++---
 source3/utils/net_rpc_rights.c | 4 ++--
 source3/utils/net_util.c       | 2 +-
 source3/utils/netlookup.c      | 4 ++--
 source3/utils/smbcacls.c       | 4 ++--
 source3/utils/smbcquotas.c     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 190992e374..f32348935f 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -2011,7 +2011,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
 				enum SID_NAME_USE *type)
 {
 	DOM_SID *sids = NULL;
-	uint32 *types = NULL;
+	enum SID_NAME_USE *types = NULL;
 	struct rpc_pipe_client *pipe_hnd;
 	POLICY_HND lsa_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -2717,7 +2717,7 @@ static NTSTATUS rpc_list_alias_members(struct rpc_pipe_client *pipe_hnd,
 	DOM_SID *alias_sids;
 	char **domains;
 	char **names;
-	uint32 *types;
+	enum SID_NAME_USE *types;
 	int i;
 
 	result = rpccli_samr_open_alias(pipe_hnd, mem_ctx, domain_pol,
@@ -4075,7 +4075,7 @@ static NTSTATUS rpc_aliaslist_dump(const DOM_SID *domain_sid,
 	for (i=0; i<num_server_aliases; i++) {
 		char **names;
 		char **domains;
-		uint32 *types;
+		enum SID_NAME_USE *types;
 		int j;
 
 		struct full_alias *alias = &server_aliases[i];
diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 0dd28c3ac6..11f5ea5fab 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -29,7 +29,7 @@ static NTSTATUS sid_to_name(struct rpc_pipe_client *pipe_hnd,
 				fstring name)
 {
 	POLICY_HND pol;
-	uint32 *sid_types;
+	enum SID_NAME_USE *sid_types;
 	NTSTATUS result;
 	char **domains, **names;
 
@@ -60,7 +60,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *pipe_hnd,
 			    DOM_SID *sid, const char *name)
 {
 	POLICY_HND pol;
-	uint32 *sid_types;
+	enum SID_NAME_USE *sid_types;
 	NTSTATUS result;
 	DOM_SID *sids;
 
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 805104cefa..953c67d62e 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -39,7 +39,7 @@ NTSTATUS net_rpc_lookup_name(TALLOC_CTX *mem_ctx, struct cli_state *cli,
 	NTSTATUS result = NT_STATUS_OK;
 	const char **dom_names;
 	DOM_SID *sids;
-	uint32_t *types;
+	enum SID_NAME_USE *types;
 
 	ZERO_STRUCT(pol);
 
diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index df0fe0c843..2d105335e8 100644
--- a/source3/utils/netlookup.c
+++ b/source3/utils/netlookup.c
@@ -157,7 +157,7 @@ NTSTATUS net_lookup_name_from_sid(TALLOC_CTX *ctx,
 	struct con_struct *csp = NULL;
 	char **domains;
 	char **names;
-	uint32 *types;
+	enum SID_NAME_USE *types;
 
 	*ppdomain = NULL;
 	*ppname = NULL;
@@ -195,7 +195,7 @@ NTSTATUS net_lookup_sid_from_name(TALLOC_CTX *ctx, const char *full_name, DOM_SI
 	NTSTATUS nt_status;
 	struct con_struct *csp = NULL;
 	DOM_SID *sids = NULL;
-	uint32 *types = NULL;
+	enum SID_NAME_USE *types = NULL;
 
 	csp = create_cs(ctx, &nt_status);
 	if (csp == NULL) {
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index b31fd95f7a..6dc9f78ad1 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -108,7 +108,7 @@ static void SidToString(fstring str, DOM_SID *sid)
 {
 	char **domains = NULL;
 	char **names = NULL;
-	uint32 *types = NULL;
+	enum SID_NAME_USE *types = NULL;
 
 	sid_to_string(str, sid);
 
@@ -135,7 +135,7 @@ static void SidToString(fstring str, DOM_SID *sid)
 /* convert a string to a SID, either numeric or username/group */
 static BOOL StringToSid(DOM_SID *sid, const char *str)
 {
-	uint32 *types = NULL;
+	enum SID_NAME_USE *types = NULL;
 	DOM_SID *sids = NULL;
 	BOOL result = True;
 
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 7b3268e783..6193395e7e 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -79,7 +79,7 @@ static void SidToString(fstring str, DOM_SID *sid, BOOL _numeric)
 {
 	char **domains = NULL;
 	char **names = NULL;
-	uint32 *types = NULL;
+	enum SID_NAME_USE *types = NULL;
 
 	sid_to_string(str, sid);
 
@@ -106,7 +106,7 @@ 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)
 {
-	uint32 *types = NULL;
+	enum SID_NAME_USE *types = NULL;
 	DOM_SID *sids = NULL;
 	BOOL result = True;
 
-- 
cgit