s3:winbindd/nss_info: change nss_map_{to|from}_alias to take nss_domain_entry

instead of just the domain name

Michael

6 files changed, 24 insertions, 22 deletions

diff --git a/source3/include/nss_info.h b/source3/include/nss_info.h
index e756136b76a..0224be099fa 100644
--- a/source3/include/nss_info.h
+++ b/source3/include/nss_info.h
@@ -66,10 +66,12 @@ struct nss_info_methods {
 				  TALLOC_CTX *ctx, 
 				  ADS_STRUCT *ads, LDAPMessage *msg,
 				  char **homedir, char **shell, char **gecos, gid_t *p_gid);
-	NTSTATUS (*map_to_alias)( TALLOC_CTX *mem_ctx, const char *domain,
-				  const char *name, char **alias );
-	NTSTATUS (*map_from_alias)( TALLOC_CTX *mem_ctx, const char *domain,
-				    const char *alias, char **name );
+	NTSTATUS (*map_to_alias)(TALLOC_CTX *mem_ctx,
+				 struct nss_domain_entry *e,
+				 const char *name, char **alias);
+	NTSTATUS (*map_from_alias)(TALLOC_CTX *mem_ctx,
+				   struct nss_domain_entry *e,
+				   const char *alias, char **name);
 	NTSTATUS (*close_fn)( void );
 };
 
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 60a2d8642aa..0f2ac5127e4 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -824,7 +824,7 @@ done:
  *********************************************************************/
 
 static NTSTATUS nss_ad_map_to_alias(TALLOC_CTX *mem_ctx,
-				    const char *domain,
+				    struct nss_domain_entry *e,
 				    const char *name,
 				    char **alias)
 {
@@ -838,7 +838,7 @@ static NTSTATUS nss_ad_map_to_alias(TALLOC_CTX *mem_ctx,
 
 	/* Check incoming parameters */
 
-	if ( !domain || !name || !*alias) {
+	if ( !e || !e->domain || !name || !*alias) {
 		nt_status = NT_STATUS_INVALID_PARAMETER;
 		goto done;
 	}
@@ -896,7 +896,7 @@ done:
  *********************************************************************/
 
 static NTSTATUS nss_ad_map_from_alias( TALLOC_CTX *mem_ctx,
-					     const char *domain,
+					     struct nss_domain_entry *e,
 					     const char *alias,
 					     char **name )
 {
diff --git a/source3/winbindd/idmap_adex/idmap_adex.c b/source3/winbindd/idmap_adex/idmap_adex.c
index 7596b1cbd83..7e186ca8a12 100644
--- a/source3/winbindd/idmap_adex/idmap_adex.c
+++ b/source3/winbindd/idmap_adex/idmap_adex.c
@@ -329,9 +329,9 @@ static NTSTATUS _nss_adex_get_info(struct
 /**********************************************************************
  *********************************************************************/
 
-static NTSTATUS _nss_adex_map_to_alias(TALLOC_CTX * mem_ctx, const char
-					  *domain, const char
-					  *name, char **alias)
+static NTSTATUS _nss_adex_map_to_alias(TALLOC_CTX * mem_ctx,
+				       struct nss_domain_entry *e,
+				       const char *name, char **alias)
 {
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
         struct likewise_cell *cell = NULL;
@@ -344,7 +344,7 @@ static NTSTATUS _nss_adex_map_to_alias(TALLOC_CTX * mem_ctx, const char
 		BAIL_ON_NTSTATUS_ERROR(nt_status);
 	}
 
-	nt_status = cell->provider->map_to_alias(mem_ctx, domain,
+	nt_status = cell->provider->map_to_alias(mem_ctx, e->domain,
 						 name, alias);
 
 	/* go ahead and allow the cache mgr to mark this in
@@ -360,9 +360,9 @@ done:
 /**********************************************************************
  *********************************************************************/
 
-static NTSTATUS _nss_adex_map_from_alias(TALLOC_CTX * mem_ctx, const char
-					    *domain, const char
-					    *alias, char **name)
+static NTSTATUS _nss_adex_map_from_alias(TALLOC_CTX * mem_ctx,
+					 struct nss_domain_entry *e,
+					 const char *alias, char **name)
 {
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
         struct likewise_cell *cell = NULL;
@@ -376,7 +376,7 @@ static NTSTATUS _nss_adex_map_from_alias(TALLOC_CTX * mem_ctx, const char
 	}
 
 
-	nt_status = cell->provider->map_from_alias(mem_ctx, domain,
+	nt_status = cell->provider->map_from_alias(mem_ctx, e->domain,
 						   alias, name);
 
 	/* go ahead and allow the cache mgr to mark this in
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index a050f99bc80..7dd94aede0d 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -304,14 +304,14 @@ done:
  *********************************************************************/
 
 static NTSTATUS nss_hash_map_to_alias(TALLOC_CTX *mem_ctx,
-					const char *domain,
+					struct nss_domain_entry *e,
 					const char *name,
 					char **alias)
 {
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	const char *value;
 
-	value = talloc_asprintf(mem_ctx, "%s\\%s", domain, name);
+	value = talloc_asprintf(mem_ctx, "%s\\%s", e->domain, name);
 	BAIL_ON_PTR_NT_ERROR(value, nt_status);
 
 	nt_status = mapfile_lookup_key(mem_ctx, value, alias);
@@ -325,7 +325,7 @@ done:
  *********************************************************************/
 
 static NTSTATUS nss_hash_map_from_alias(TALLOC_CTX *mem_ctx,
-					  const char *domain,
+					  struct nss_domain_entry *e,
 					  const char *alias,
 					  char **name)
 {
diff --git a/source3/winbindd/nss_info.c b/source3/winbindd/nss_info.c
index 0e8cb602571..c35df4fbed8 100644
--- a/source3/winbindd/nss_info.c
+++ b/source3/winbindd/nss_info.c
@@ -295,7 +295,7 @@ static struct nss_domain_entry *find_nss_domain( const char *domain )
 
 	m = p->backend->methods;
 
-	return m->map_to_alias( mem_ctx, domain, name, alias );
+	return m->map_to_alias(mem_ctx, p, name, alias);
 }
 
 
@@ -316,7 +316,7 @@ static struct nss_domain_entry *find_nss_domain( const char *domain )
 
 	m = p->backend->methods;
 
-	return m->map_from_alias( mem_ctx, domain, alias, name );
+	return m->map_from_alias( mem_ctx, p, alias, name );
 }
 
 /********************************************************************
diff --git a/source3/winbindd/nss_info_template.c b/source3/winbindd/nss_info_template.c
index d8f903ddd08..f44c73f3a60 100644
--- a/source3/winbindd/nss_info_template.c
+++ b/source3/winbindd/nss_info_template.c
@@ -62,7 +62,7 @@ static NTSTATUS nss_template_get_info( struct nss_domain_entry *e,
  *********************************************************************/
 
 static NTSTATUS nss_template_map_to_alias( TALLOC_CTX *mem_ctx,
-					   const char *domain,
+					   struct nss_domain_entry *e,
 					   const char *name,
 					   char **alias )
 {
@@ -73,7 +73,7 @@ static NTSTATUS nss_template_map_to_alias( TALLOC_CTX *mem_ctx,
  *********************************************************************/
 
 static NTSTATUS nss_template_map_from_alias( TALLOC_CTX *mem_ctx,
-					     const char *domain,
+					     struct nss_domain_entry *e,
 					     const char *alias,
 					     char **name )
 {