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.

5 files changed, 39 insertions, 39 deletions

diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index dbd466fe403..b339754c6df 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -33,7 +33,7 @@
 BOOL lookup_name(TALLOC_CTX *mem_ctx,
 		 const char *full_name, int flags,
 		 const char **ret_domain, const char **ret_name,
-		 DOM_SID *ret_sid, enum SID_NAME_USE *ret_type)
+		 DOM_SID *ret_sid, enum lsa_SidType *ret_type)
 {
 	char *p;
 	const char *tmp;
@@ -41,7 +41,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 	const char *name = NULL;
 	uint32 rid;
 	DOM_SID sid;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
 	if (tmp_ctx == NULL) {
@@ -232,7 +232,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 	if (IS_DC && winbind_lookup_name("", name, &sid, &type)) {
 		DOM_SID dom_sid;
 		uint32 tmp_rid;
-		enum SID_NAME_USE domain_type;
+		enum lsa_SidType domain_type;
 		
 		if (type == SID_NAME_DOMAIN) {
 			/* Swap name and type */
@@ -332,7 +332,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 BOOL lookup_name_smbconf(TALLOC_CTX *mem_ctx,
 		 const char *full_name, int flags,
 		 const char **ret_domain, const char **ret_name,
-		 DOM_SID *ret_sid, enum SID_NAME_USE *ret_type)
+		 DOM_SID *ret_sid, enum lsa_SidType *ret_type)
 {
 	char *qualified_name;
 	const char *p;
@@ -393,11 +393,11 @@ static BOOL wb_lookup_rids(TALLOC_CTX *mem_ctx,
 			   const DOM_SID *domain_sid,
 			   int num_rids, uint32 *rids,
 			   const char **domain_name,
-			   const char **names, enum SID_NAME_USE *types)
+			   const char **names, enum lsa_SidType *types)
 {
 	int i;
 	const char **my_names;
-	enum SID_NAME_USE *my_types;
+	enum lsa_SidType *my_types;
 	TALLOC_CTX *tmp_ctx;
 
 	if (!(tmp_ctx = talloc_init("wb_lookup_rids"))) {
@@ -435,12 +435,12 @@ static BOOL wb_lookup_rids(TALLOC_CTX *mem_ctx,
 static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
 			int num_rids, uint32_t *rids,
 			const char **domain_name,
-			const char ***names, enum SID_NAME_USE **types)
+			const char ***names, enum lsa_SidType **types)
 {
 	int i;
 
 	*names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
-	*types = TALLOC_ARRAY(mem_ctx, enum SID_NAME_USE, num_rids);
+	*types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
 
 	if ((*names == NULL) || (*types == NULL)) {
 		return False;
@@ -549,7 +549,7 @@ static BOOL lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
 			     const char **name)
 {
 	const char *tmp;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 
 	if (sid_check_is_domain(sid)) {
 		*name = talloc_strdup(mem_ctx, get_global_sam_name());
@@ -809,7 +809,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
 		uint32_t *rids;
 		const char *domain_name = NULL;
 		const char **names;
-		enum SID_NAME_USE *types;
+		enum lsa_SidType *types;
 		struct lsa_dom_info *dom = &dom_infos[i];
 
 		if (!dom->valid) {
@@ -871,7 +871,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
 
 BOOL lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
 		const char **ret_domain, const char **ret_name,
-		enum SID_NAME_USE *ret_type)
+		enum lsa_SidType *ret_type)
 {
 	struct lsa_dom_info *domain;
 	struct lsa_name_info *name;
@@ -941,14 +941,14 @@ static struct uid_sid_cache {
 	struct uid_sid_cache *next, *prev;
 	uid_t uid;
 	DOM_SID sid;
-	enum SID_NAME_USE sidtype;
+	enum lsa_SidType sidtype;
 } *uid_sid_cache_head;
 
 static struct gid_sid_cache {
 	struct gid_sid_cache *next, *prev;
 	gid_t gid;
 	DOM_SID sid;
-	enum SID_NAME_USE sidtype;
+	enum lsa_SidType sidtype;
 } *gid_sid_cache_head;
 
 /*****************************************************************
@@ -1194,7 +1194,7 @@ void gid_to_sid(DOM_SID *psid, gid_t gid)
 
 BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid)
 {
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	uint32 rid;
 	gid_t gid;
 
@@ -1271,7 +1271,7 @@ BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 	uint32 rid;
 	GROUP_MAP map;
 	union unid_t id;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	uid_t uid;
 
 	if (fetch_gid_from_cache(pgid, psid))
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index 8229fd68ab6..da3ddb39149 100644
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -551,7 +551,7 @@ BOOL algorithmic_pdb_rid_is_user(uint32 rid)
  ********************************************************************/
 
 BOOL lookup_global_sam_name(const char *user, int flags, uint32_t *rid,
-			    enum SID_NAME_USE *type)
+			    enum lsa_SidType *type)
 {
 	GROUP_MAP map;
 	BOOL ret;
diff --git a/source/passdb/pdb_get_set.c b/source/passdb/pdb_get_set.c
index 3b774b510b0..466508e99b6 100644
--- a/source/passdb/pdb_get_set.c
+++ b/source/passdb/pdb_get_set.c
@@ -166,7 +166,7 @@ const DOM_SID *pdb_get_group_sid(struct samu *sampass)
 	}
 	
 	if ( pdb_gid_to_sid(pwd->pw_gid, gsid) ) {
-		enum SID_NAME_USE type = SID_NAME_UNKNOWN;
+		enum lsa_SidType type = SID_NAME_UNKNOWN;
 		TALLOC_CTX *mem_ctx = talloc_init("pdb_get_group_sid");
 		BOOL lookup_ret;
 		
diff --git a/source/passdb/pdb_interface.c b/source/passdb/pdb_interface.c
index a42f8325f65..cc05d974681 100644
--- a/source/passdb/pdb_interface.c
+++ b/source/passdb/pdb_interface.c
@@ -46,7 +46,7 @@ static void lazy_initialize_passdb(void)
 
 static BOOL lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
 				  const char **name,
-				  enum SID_NAME_USE *psid_name_use,
+				  enum lsa_SidType *psid_name_use,
 				  union unid_t *unix_id);
 /*******************************************************************
  Clean up uninitialised passwords.  The only way to tell 
@@ -696,7 +696,7 @@ NTSTATUS pdb_delete_group_mapping_entry(DOM_SID sid)
 	return pdb->delete_group_mapping_entry(pdb, sid);
 }
 
-BOOL pdb_enum_group_mapping(const DOM_SID *sid, enum SID_NAME_USE sid_name_use, GROUP_MAP **pp_rmap,
+BOOL pdb_enum_group_mapping(const DOM_SID *sid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
 			    size_t *p_num_entries, BOOL unix_only)
 {
 	struct pdb_methods *pdb = pdb_get_methods();
@@ -988,7 +988,7 @@ NTSTATUS pdb_lookup_rids(const DOM_SID *domain_sid,
 			 int num_rids,
 			 uint32 *rids,
 			 const char **names,
-			 enum SID_NAME_USE *attrs)
+			 enum lsa_SidType *attrs)
 {
 	struct pdb_methods *pdb = pdb_get_methods();
 	return pdb->lookup_rids(pdb, domain_sid, num_rids, rids, names, attrs);
@@ -998,7 +998,7 @@ NTSTATUS pdb_lookup_names(const DOM_SID *domain_sid,
 			  int num_names,
 			  const char **names,
 			  uint32 *rids,
-			  enum SID_NAME_USE *attrs)
+			  enum lsa_SidType *attrs)
 {
 	struct pdb_methods *pdb = pdb_get_methods();
 	return pdb->lookup_names(pdb, domain_sid, num_names, names, rids, attrs);
@@ -1035,7 +1035,7 @@ BOOL pdb_gid_to_sid(gid_t gid, DOM_SID *sid)
 }
 
 BOOL pdb_sid_to_id(const DOM_SID *sid, union unid_t *id,
-		   enum SID_NAME_USE *type)
+		   enum lsa_SidType *type)
 {
 	struct pdb_methods *pdb = pdb_get_methods();
 	return pdb->sid_to_id(pdb, sid, id, type);
@@ -1058,7 +1058,7 @@ BOOL pdb_new_rid(uint32 *rid)
 {
 	struct pdb_methods *pdb = pdb_get_methods();
 	const char *name = NULL;
-	enum SID_NAME_USE type;
+	enum lsa_SidType type;
 	uint32 allocated_rid = 0;
 	int i;
 	TALLOC_CTX *ctx;
@@ -1253,7 +1253,7 @@ static BOOL pdb_default_gid_to_sid(struct pdb_methods *methods, gid_t gid,
 
 static BOOL pdb_default_sid_to_id(struct pdb_methods *methods,
 				  const DOM_SID *sid,
-				  union unid_t *id, enum SID_NAME_USE *type)
+				  union unid_t *id, enum lsa_SidType *type)
 {
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = False;
@@ -1471,7 +1471,7 @@ NTSTATUS pdb_default_enum_group_memberships(struct pdb_methods *methods,
 
 static BOOL lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
 				  const char **name,
-				  enum SID_NAME_USE *psid_name_use,
+				  enum lsa_SidType *psid_name_use,
 				  union unid_t *unix_id)
 {
 	struct samu *sam_account = NULL;
@@ -1563,7 +1563,7 @@ NTSTATUS pdb_default_lookup_rids(struct pdb_methods *methods,
 				 int num_rids,
 				 uint32 *rids,
 				 const char **names,
-				 enum SID_NAME_USE *attrs)
+				 enum lsa_SidType *attrs)
 {
 	int i;
 	NTSTATUS result;
@@ -1626,7 +1626,7 @@ NTSTATUS pdb_default_lookup_names(struct pdb_methods *methods,
 				  int num_names,
 				  const char **names,
 				  uint32 *rids,
-				  enum SID_NAME_USE *attrs)
+				  enum lsa_SidType *attrs)
 {
 	int i;
 	NTSTATUS result;
@@ -1842,7 +1842,7 @@ static void search_end_groups(struct pdb_search *search)
 }
 
 static BOOL pdb_search_grouptype(struct pdb_search *search,
-				 const DOM_SID *sid, enum SID_NAME_USE type)
+				 const DOM_SID *sid, enum lsa_SidType type)
 {
 	struct group_search *state;
 
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index afc95fe90f1..865bcdfc9fe 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -2156,7 +2156,7 @@ static BOOL init_group_from_ldap(struct ldapsam_privates *ldap_state,
 			get_attr_key2string( groupmap_attr_list, LDAP_ATTR_GROUP_TYPE)));
 		return False;
 	}
-	map->sid_name_use = (enum SID_NAME_USE)atol(temp);
+	map->sid_name_use = (enum lsa_SidType)atol(temp);
 
 	if ((map->sid_name_use < SID_NAME_USER) ||
 			(map->sid_name_use > SID_NAME_UNKNOWN)) {
@@ -3104,7 +3104,7 @@ static NTSTATUS ldapsam_getsamgrent(struct pdb_methods *my_methods,
  *********************************************************************/
 
 static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods,
-					   const DOM_SID *domsid, enum SID_NAME_USE sid_name_use,
+					   const DOM_SID *domsid, enum lsa_SidType sid_name_use,
 					   GROUP_MAP **pp_rmap,
 					   size_t *p_num_entries,
 					   BOOL unix_only)
@@ -3166,7 +3166,7 @@ static NTSTATUS ldapsam_modify_aliasmem(struct pdb_methods *methods,
 	int count;
 	LDAPMod **mods = NULL;
 	int rc;
-	enum SID_NAME_USE type = SID_NAME_USE_NONE;
+	enum lsa_SidType type = SID_NAME_USE_NONE;
 
 	pstring filter;
 
@@ -3278,7 +3278,7 @@ static NTSTATUS ldapsam_enum_aliasmem(struct pdb_methods *methods,
 	int i;
 	pstring filter;
 	size_t num_members = 0;
-	enum SID_NAME_USE type = SID_NAME_USE_NONE;
+	enum lsa_SidType type = SID_NAME_USE_NONE;
 
 	*pp_members = NULL;
 	*p_num_members = 0;
@@ -3377,7 +3377,7 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
 	int i;
 	int rc;
 	char *filter;
-	enum SID_NAME_USE type = SID_NAME_USE_NONE;
+	enum lsa_SidType type = SID_NAME_USE_NONE;
 
 	if (sid_check_is_builtin(domain_sid)) {
 		type = SID_NAME_ALIAS;
@@ -3644,7 +3644,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
 				    int num_rids,
 				    uint32 *rids,
 				    const char **names,
-				    enum SID_NAME_USE *attrs)
+				    enum lsa_SidType *attrs)
 {
 	struct ldapsam_privates *ldap_state =
 		(struct ldapsam_privates *)methods->private_data;
@@ -3794,7 +3794,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
 		uint32 rid;
 		int rid_index;
 		const char *attr;
-		enum SID_NAME_USE type;
+		enum lsa_SidType type;
 		const char *dn = smbldap_talloc_dn(mem_ctx, ld, entry);
 
 		attr = smbldap_talloc_single_attribute(ld, entry, "sambaGroupType",
@@ -3805,7 +3805,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
 			continue;
 		}
 
-		type = (enum SID_NAME_USE)atol(attr);
+		type = (enum lsa_SidType)atol(attr);
 
 		/* Consistency checks */
 		if ((is_builtin && (type != SID_NAME_ALIAS)) ||
@@ -4326,7 +4326,7 @@ static BOOL ldapgroup2displayentry(struct ldap_search_state *state,
 static BOOL ldapsam_search_grouptype(struct pdb_methods *methods,
 				     struct pdb_search *search,
                                      const DOM_SID *sid,
-				     enum SID_NAME_USE type)
+				     enum lsa_SidType type)
 {
 	struct ldapsam_privates *ldap_state =
 		(struct ldapsam_privates *)methods->private_data;
@@ -4513,7 +4513,7 @@ static BOOL ldapsam_new_rid(struct pdb_methods *methods, uint32 *rid)
 
 static BOOL ldapsam_sid_to_id(struct pdb_methods *methods,
 			      const DOM_SID *sid,
-			      union unid_t *id, enum SID_NAME_USE *type)
+			      union unid_t *id, enum lsa_SidType *type)
 {
 	struct ldapsam_privates *priv =
 		(struct ldapsam_privates *)methods->private_data;
@@ -4576,7 +4576,7 @@ static BOOL ldapsam_sid_to_id(struct pdb_methods *methods,
 		}
 
 		id->gid = strtoul(gid_str, NULL, 10);
-		*type = (enum SID_NAME_USE)strtoul(value, NULL, 10);
+		*type = (enum lsa_SidType)strtoul(value, NULL, 10);
 		ret = True;
 		goto done;
 	}