r18271: Big change:

* autogenerate lsa ndr code
* rename 'enum SID_NAME_USE' to 'enum lsa_SidType'
* merge a log more security descriptor functions from
  gen_ndr/ndr_security.c in SAMBA_4_0

The most embarassing thing is the "#define strlen_m strlen"
We need a real implementation in SAMBA_3_0 which I'll work on
after this code is in.
(This used to be commit 3da9f80c28b1e75ef6d46d38fbb81ade6b9fa951)

9 files changed, 32 insertions, 32 deletions

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 4708efa908d..ad1a141cfc5 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -188,7 +188,7 @@ static int net_groupmap_add(int argc, const char **argv)
 	fstring string_sid = "";
 	fstring type = "";
 	fstring ntcomment = "";
-	enum SID_NAME_USE sid_type = SID_NAME_DOM_GRP;
+	enum lsa_SidType sid_type = SID_NAME_DOM_GRP;
 	uint32 rid = 0;	
 	gid_t gid;
 	int i;
@@ -345,7 +345,7 @@ static int net_groupmap_modify(int argc, const char **argv)
 	fstring ntgroup = "";
 	fstring unixgrp = "";
 	fstring sid_string = "";
-	enum SID_NAME_USE sid_type = SID_NAME_UNKNOWN;
+	enum lsa_SidType sid_type = SID_NAME_UNKNOWN;
 	int i;
 	gid_t gid;
 
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index ebc7ba98b0d..00cf2f62130 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -247,7 +247,7 @@ static int net_lookup_name(int argc, const char **argv)
 {
 	const char *dom, *name;
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 
 	if (argc != 1) {
 		d_printf("usage: net lookup name <name>\n");
@@ -269,7 +269,7 @@ static int net_lookup_sid(int argc, const char **argv)
 {
 	const char *dom, *name;
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 
 	if (argc != 1) {
 		d_printf("usage: net lookup sid <sid>\n");
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e0c361822dc..b05eff8088f 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1330,7 +1330,7 @@ static NTSTATUS rpc_sh_handle_user(TALLOC_CTX *mem_ctx,
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	DOM_SID sid;
 	uint32 rid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 
 	if (argc == 0) {
 		d_fprintf(stderr, "usage: %s <username>\n", ctx->whoami);
@@ -2008,10 +2008,10 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
 				TALLOC_CTX *mem_ctx,
 				const char *name,
 				DOM_SID *sid,
-				enum SID_NAME_USE *type)
+				enum lsa_SidType *type)
 {
 	DOM_SID *sids = NULL;
-	enum SID_NAME_USE *types = NULL;
+	enum lsa_SidType *types = NULL;
 	struct rpc_pipe_client *pipe_hnd;
 	POLICY_HND lsa_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -2131,7 +2131,7 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
 	POLICY_HND alias_pol;
 
 	DOM_SID member_sid;
-	enum SID_NAME_USE member_type;
+	enum lsa_SidType member_type;
 
 	DOM_SID sid;
 
@@ -2192,7 +2192,7 @@ static NTSTATUS rpc_group_addmem_internals(const DOM_SID *domain_sid,
 					const char **argv)
 {
 	DOM_SID group_sid;
-	enum SID_NAME_USE group_type;
+	enum lsa_SidType group_type;
 
 	if (argc != 2) {
 		d_printf("Usage: 'net rpc group addmem <group> <member>\n");
@@ -2308,7 +2308,7 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
 	POLICY_HND alias_pol;
 
 	DOM_SID member_sid;
-	enum SID_NAME_USE member_type;
+	enum lsa_SidType member_type;
 
 	DOM_SID sid;
 
@@ -2366,7 +2366,7 @@ static NTSTATUS rpc_group_delmem_internals(const DOM_SID *domain_sid,
 					const char **argv)
 {
 	DOM_SID group_sid;
-	enum SID_NAME_USE group_type;
+	enum lsa_SidType group_type;
 
 	if (argc != 2) {
 		d_printf("Usage: 'net rpc group delmem <group> <member>\n");
@@ -2717,7 +2717,7 @@ static NTSTATUS rpc_list_alias_members(struct rpc_pipe_client *pipe_hnd,
 	DOM_SID *alias_sids;
 	char **domains;
 	char **names;
-	enum SID_NAME_USE *types;
+	enum lsa_SidType *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;
-		enum SID_NAME_USE *types;
+		enum lsa_SidType *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 11f5ea5fabf..11c4991e7d7 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;
-	enum SID_NAME_USE *sid_types;
+	enum lsa_SidType *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;
-	enum SID_NAME_USE *sid_types;
+	enum lsa_SidType *sid_types;
 	NTSTATUS result;
 	DOM_SID *sids;
 
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 654c9ec5b2a..9edbc7b8cf4 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -32,7 +32,7 @@ static int net_sam_userset(int argc, const char **argv, const char *field,
 {
 	struct samu *sam_acct = NULL;
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
 
@@ -127,7 +127,7 @@ static int net_sam_set_userflag(int argc, const char **argv, const char *field,
 {
 	struct samu *sam_acct = NULL;
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
 	uint16 acct_flags;
@@ -215,7 +215,7 @@ static int net_sam_set_time(int argc, const char **argv, const char *field,
 {
 	struct samu *sam_acct = NULL;
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
 	time_t new_time;
@@ -302,7 +302,7 @@ static int net_sam_set_comment(int argc, const char **argv)
 {
 	GROUP_MAP map;
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
 
@@ -462,7 +462,7 @@ static int net_sam_createbuiltingroup(int argc, const char **argv)
 {
 	NTSTATUS status;
 	uint32 rid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	fstring groupname;
 	DOM_SID sid;
 
@@ -514,7 +514,7 @@ static int net_sam_addmem(int argc, const char **argv)
 {
 	const char *groupdomain, *groupname, *memberdomain, *membername;
 	DOM_SID group, member;
-	enum SID_NAME_USE grouptype, membertype;
+	enum lsa_SidType grouptype, membertype;
 	NTSTATUS status;
 
 	if (argc != 2) {
@@ -587,7 +587,7 @@ static int net_sam_delmem(int argc, const char **argv)
 	const char *memberdomain = NULL;
 	const char *membername = NULL;
 	DOM_SID group, member;
-	enum SID_NAME_USE grouptype;
+	enum lsa_SidType grouptype;
 	NTSTATUS status;
 
 	if (argc != 2) {
@@ -645,7 +645,7 @@ static int net_sam_listmem(int argc, const char **argv)
 {
 	const char *groupdomain, *groupname;
 	DOM_SID group;
-	enum SID_NAME_USE grouptype;
+	enum lsa_SidType grouptype;
 	NTSTATUS status;
 
 	if (argc != 1) {
@@ -793,7 +793,7 @@ static int net_sam_list(int argc, const char **argv)
 static int net_sam_show(int argc, const char **argv)
 {
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	const char *dom, *name;
 
 	if (argc != 1) {
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 953c67d62e3..be39a754656 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -32,14 +32,14 @@ BOOL is_valid_policy_hnd(const POLICY_HND *hnd)
 NTSTATUS net_rpc_lookup_name(TALLOC_CTX *mem_ctx, struct cli_state *cli,
 			     const char *name, const char **ret_domain,
 			     const char **ret_name, DOM_SID *ret_sid,
-			     enum SID_NAME_USE *ret_type)
+			     enum lsa_SidType *ret_type)
 {
 	struct rpc_pipe_client *lsa_pipe;
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_OK;
 	const char **dom_names;
 	DOM_SID *sids;
-	enum SID_NAME_USE *types;
+	enum lsa_SidType *types;
 
 	ZERO_STRUCT(pol);
 
diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index d82630e5c82..33b6c4bb257 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;
-	enum SID_NAME_USE *types;
+	enum lsa_SidType *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;
-	enum SID_NAME_USE *types = NULL;
+	enum lsa_SidType *types = NULL;
 
 	csp = create_cs(ctx, &nt_status);
 	if (csp == NULL) {
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 6dc9f78ad1e..85c59db5ec3 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;
-	enum SID_NAME_USE *types = NULL;
+	enum lsa_SidType *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)
 {
-	enum SID_NAME_USE *types = NULL;
+	enum lsa_SidType *types = NULL;
 	DOM_SID *sids = NULL;
 	BOOL result = True;
 
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 6193395e7e8..40f4a86f96b 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;
-	enum SID_NAME_USE *types = NULL;
+	enum lsa_SidType *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)
 {
-	enum SID_NAME_USE *types = NULL;
+	enum lsa_SidType *types = NULL;
 	DOM_SID *sids = NULL;
 	BOOL result = True;