Index: rpc_server/srv_samr_nt.c
===================================================================
--- rpc_server/srv_samr_nt.c	(revision 16668)
+++ rpc_server/srv_samr_nt.c	(working copy)
@@ -1640,7 +1640,7 @@
 	}
 
 	names = TALLOC_ZERO_ARRAY(p->mem_ctx, const char *, num_rids);
-	attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, uint32, num_rids);
+	attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, enum SID_NAME_USE, num_rids);
 
 	if ((num_rids != 0) && ((names == NULL) || (attrs == NULL)))
 		return NT_STATUS_NO_MEMORY;
Index: passdb/lookup_sid.c
===================================================================
--- passdb/lookup_sid.c	(revision 16668)
+++ passdb/lookup_sid.c	(working copy)
@@ -357,7 +357,7 @@
 				const DOM_SID *domain_sid,
 				int num_rids, uint32 *rids,
 				const char **domain_name,
-				const char **names, uint32 *types)
+				const char **names, enum SID_NAME_USE *types)
 {
 	/* Unless the winbind interface is upgraded, fall back to ask for
 	 * individual sids. I imagine introducing a lookuprids operation that
Index: rpc_parse/parse_samr.c
===================================================================
--- rpc_parse/parse_samr.c	(revision 16668)
+++ rpc_parse/parse_samr.c	(working copy)
@@ -4248,7 +4248,7 @@
 
 void init_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS * r_u,
 			     uint32 num_names, UNIHDR * hdr_name,
-			     UNISTR2 *uni_name, uint32 *type)
+			     UNISTR2 *uni_name, enum SID_NAME_USE *type)
 {
 	DEBUG(5, ("init_samr_r_lookup_rids\n"));
 
@@ -4344,14 +4344,14 @@
 			return False;
 
 		if (UNMARSHALLING(ps) && (r_u->num_types2 != 0)) {
-			r_u->type = PRS_ALLOC_MEM(ps, uint32, r_u->num_types2);
+			r_u->type = PRS_ALLOC_MEM(ps, enum SID_NAME_USE, r_u->num_types2);
 			if (r_u->type == NULL)
 				return False;
 		}
 
 		for (i = 0; i < r_u->num_types2; i++) {
 			slprintf(tmp, sizeof(tmp) - 1, "type[%02d]  ", i);
-			if(!prs_uint32(tmp, ps, depth, &r_u->type[i]))
+			if(!prs_uint32(tmp, ps, depth, (uint32 *)&r_u->type[i]))
 				return False;
 		}
 	}
Index: include/rpc_samr.h
===================================================================
--- include/rpc_samr.h	(revision 16668)
+++ include/rpc_samr.h	(working copy)
@@ -1492,7 +1492,7 @@
 	uint32 ptr_types;       /* pointer to users in aliases */
 	uint32 num_types2;      /* number of users in aliases being looked up */
 
-	uint32 *type; /* SID_ENUM type */
+	enum SID_NAME_USE *type; /* SID_ENUM type */
 
 	NTSTATUS status;