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)

1 files changed, 14 insertions, 14 deletions

diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index cb4f405ee0..2cff894eb4 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -746,7 +746,7 @@ static void centry_end(struct cache_entry *centry, const char *format, ...)
 static void wcache_save_name_to_sid(struct winbindd_domain *domain, 
 				    NTSTATUS status, const char *domain_name,
 				    const char *name, const DOM_SID *sid, 
-				    enum SID_NAME_USE type)
+				    enum lsa_SidType type)
 {
 	struct cache_entry *centry;
 	fstring uname;
@@ -765,7 +765,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain,
 }
 
 static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS status, 
-				    const DOM_SID *sid, const char *domain_name, const char *name, enum SID_NAME_USE type)
+				    const DOM_SID *sid, const char *domain_name, const char *name, enum lsa_SidType type)
 {
 	struct cache_entry *centry;
 	fstring sid_string;
@@ -1266,7 +1266,7 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 			    const char *domain_name,
 			    const char *name,
 			    DOM_SID *sid,
-			    enum SID_NAME_USE *type)
+			    enum lsa_SidType *type)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
@@ -1281,7 +1281,7 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 	centry = wcache_fetch(cache, domain, "NS/%s/%s", domain_name, uname);
 	if (!centry)
 		goto do_query;
-	*type = (enum SID_NAME_USE)centry_uint32(centry);
+	*type = (enum lsa_SidType)centry_uint32(centry);
 	status = centry->status;
 	if (NT_STATUS_IS_OK(status)) {
 		centry_sid(centry, mem_ctx, sid);
@@ -1333,7 +1333,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 			    const DOM_SID *sid,
 			    char **domain_name,
 			    char **name,
-			    enum SID_NAME_USE *type)
+			    enum lsa_SidType *type)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
@@ -1347,7 +1347,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 	if (!centry)
 		goto do_query;
 	if (NT_STATUS_IS_OK(centry->status)) {
-		*type = (enum SID_NAME_USE)centry_uint32(centry);
+		*type = (enum lsa_SidType)centry_uint32(centry);
 		*domain_name = centry_string(centry, mem_ctx);
 		*name = centry_string(centry, mem_ctx);
 	}
@@ -1396,7 +1396,7 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
 			      size_t num_rids,
 			      char **domain_name,
 			      char ***names,
-			      enum SID_NAME_USE **types)
+			      enum lsa_SidType **types)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	size_t i;
@@ -1417,7 +1417,7 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
 	}
 
 	*names = TALLOC_ARRAY(mem_ctx, 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)) {
 		result = NT_STATUS_NO_MEMORY;
@@ -1447,7 +1447,7 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
 		if (NT_STATUS_IS_OK(centry->status)) {
 			char *dom;
 			have_mapped = True;
-			(*types)[i] = (enum SID_NAME_USE)centry_uint32(centry);
+			(*types)[i] = (enum lsa_SidType)centry_uint32(centry);
 			dom = centry_string(centry, mem_ctx);
 			if (*domain_name == NULL) {
 				*domain_name = dom;
@@ -2208,7 +2208,7 @@ void cache_cleanup_response(pid_t pid)
 
 BOOL lookup_cached_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
 		       const char **domain_name, const char **name,
-		       enum SID_NAME_USE *type)
+		       enum lsa_SidType *type)
 {
 	struct winbindd_domain *domain;
 	struct winbind_cache *cache;
@@ -2232,7 +2232,7 @@ BOOL lookup_cached_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
 	}
 
 	if (NT_STATUS_IS_OK(centry->status)) {
-		*type = (enum SID_NAME_USE)centry_uint32(centry);
+		*type = (enum lsa_SidType)centry_uint32(centry);
 		*domain_name = centry_string(centry, mem_ctx);
 		*name = centry_string(centry, mem_ctx);
 	}
@@ -2246,7 +2246,7 @@ BOOL lookup_cached_name(TALLOC_CTX *mem_ctx,
 			const char *domain_name,
 			const char *name,
 			DOM_SID *sid,
-			enum SID_NAME_USE *type)
+			enum lsa_SidType *type)
 {
 	struct winbindd_domain *domain;
 	struct winbind_cache *cache;
@@ -2274,7 +2274,7 @@ BOOL lookup_cached_name(TALLOC_CTX *mem_ctx,
 	}
 
 	if (NT_STATUS_IS_OK(centry->status)) {
-		*type = (enum SID_NAME_USE)centry_uint32(centry);
+		*type = (enum lsa_SidType)centry_uint32(centry);
 		centry_sid(centry, mem_ctx, sid);
 	}
 
@@ -2286,7 +2286,7 @@ BOOL lookup_cached_name(TALLOC_CTX *mem_ctx,
 
 void cache_name2sid(struct winbindd_domain *domain, 
 		    const char *domain_name, const char *name,
-		    enum SID_NAME_USE type, const DOM_SID *sid)
+		    enum lsa_SidType type, const DOM_SID *sid)
 {
 	wcache_save_name_to_sid(domain, NT_STATUS_OK, domain_name, name,
 				sid, type);