s3:idmap: remove the params argument from the init function

12 files changed, 21 insertions, 29 deletions

diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index 7b3d6decf2..800e69421d 100644
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -45,7 +45,7 @@ struct idmap_domain {
 struct idmap_methods {
 
 	/* Called when backend is first loaded */
-	NTSTATUS (*init)(struct idmap_domain *dom, const char *params);
+	NTSTATUS (*init)(struct idmap_domain *dom);
 
 	/* Map an array of uids/gids to SIDs.  The caller specifies
 	   the uid/gid and type. Gets back the SID. */
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index 94e164ef62..a48f2e4f1a 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -282,7 +282,7 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 
-	status = result->methods->init(result, params);
+	status = result->methods->init(result);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("idmap initialization returned %s\n",
 			  nt_errstr(status)));
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 1984844d2a..cf15f038ca 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -210,8 +210,7 @@ static int idmap_ad_context_destructor(struct idmap_ad_context *ctx)
 /************************************************************************
  ***********************************************************************/
 
-static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom,
-				    const char *params)
+static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom)
 {
 	struct idmap_ad_context *ctx;
 	char *config_option;
diff --git a/source3/winbindd/idmap_adex/idmap_adex.c b/source3/winbindd/idmap_adex/idmap_adex.c
index c8d616b400..c13642e741 100644
--- a/source3/winbindd/idmap_adex/idmap_adex.c
+++ b/source3/winbindd/idmap_adex/idmap_adex.c
@@ -42,8 +42,7 @@ NTSTATUS init_module(void);
  it will be dropped from the idmap backend list.
  *******************************************************************/
 
-static NTSTATUS _idmap_adex_init(struct idmap_domain *dom,
-				     const char *params)
+static NTSTATUS _idmap_adex_init(struct idmap_domain *dom)
 {
 	ADS_STRUCT *ads = NULL;
 	ADS_STATUS status;
@@ -168,7 +167,7 @@ static NTSTATUS _idmap_adex_get_sid_from_id(struct
 		ids[i]->status = ID_UNKNOWN;
 	}
 	
-	nt_status = _idmap_adex_init(dom, NULL);
+	nt_status = _idmap_adex_init(dom);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
@@ -221,7 +220,7 @@ static NTSTATUS _idmap_adex_get_id_from_sid(struct
 		ids[i]->status = ID_UNKNOWN;
 	}
 	
-	nt_status = _idmap_adex_init(dom, NULL);
+	nt_status = _idmap_adex_init(dom);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
@@ -264,7 +263,7 @@ static NTSTATUS _idmap_adex_get_id_from_sid(struct
 static NTSTATUS _nss_adex_init(struct nss_domain_entry
 				  *e)
 {
-	return _idmap_adex_init(NULL, NULL);
+	return _idmap_adex_init(NULL);
 }
 
 /**********************************************************************
@@ -281,7 +280,7 @@ static NTSTATUS _nss_adex_get_info(struct
 	NTSTATUS nt_status;
         struct likewise_cell *cell;
 
-	nt_status = _idmap_adex_init(NULL, NULL);
+	nt_status = _idmap_adex_init(NULL);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
@@ -303,7 +302,7 @@ static NTSTATUS _nss_adex_map_to_alias(TALLOC_CTX * mem_ctx,
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
         struct likewise_cell *cell = NULL;
 
-	nt_status = _idmap_adex_init(NULL, NULL);
+	nt_status = _idmap_adex_init(NULL);
 	BAIL_ON_NTSTATUS_ERROR(nt_status);
 
 	if ((cell = cell_list_head()) == NULL) {
@@ -334,7 +333,7 @@ static NTSTATUS _nss_adex_map_from_alias(TALLOC_CTX * mem_ctx,
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
         struct likewise_cell *cell = NULL;
 
-	nt_status = _idmap_adex_init(NULL, NULL);
+	nt_status = _idmap_adex_init(NULL);
 	BAIL_ON_NTSTATUS_ERROR(nt_status);
 
 	if ((cell = cell_list_head()) == NULL) {
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index ff33a5d14f..81919216d6 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -427,8 +427,7 @@ static NTSTATUS idmap_autorid_saveconfig(struct autorid_global_config *cfg)
 	return status;
 }
 
-static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom,
-					 const char *params)
+static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
 {
 	struct autorid_global_config *config;
 	struct autorid_global_config *storedconfig = NULL;
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index 61ae13ac3c..474387918e 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -104,8 +104,7 @@ static void separate_hashes(uint32_t id,
 /*********************************************************************
  ********************************************************************/
 
-static NTSTATUS be_init(struct idmap_domain *dom,
-			const char *params)
+static NTSTATUS be_init(struct idmap_domain *dom)
 {
 	struct sid_hash_table *hashed_domains;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
@@ -172,7 +171,7 @@ static NTSTATUS unixids_to_sids(struct idmap_domain *dom,
 		ids[i]->status = ID_UNKNOWN;
 	}
 
-	nt_status = be_init(dom, NULL);
+	nt_status = be_init(dom);
 	BAIL_ON_NTSTATUS_ERROR(nt_status);
 
 	if (!ids) {
@@ -222,7 +221,7 @@ static NTSTATUS sids_to_unixids(struct idmap_domain *dom,
 		ids[i]->status = ID_UNKNOWN;
 	}
 
-	nt_status = be_init(dom, NULL);
+	nt_status = be_init(dom);
 	BAIL_ON_NTSTATUS_ERROR(nt_status);
 
 	if (!ids) {
@@ -260,7 +259,7 @@ done:
 
 static NTSTATUS nss_hash_init(struct nss_domain_entry *e )
 {
-	return be_init(NULL, NULL);
+	return be_init(NULL);
 }
 
 /**********************************************************************
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 7edc72548a..7195912fc3 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -431,8 +431,7 @@ static int idmap_ldap_close_destructor(struct idmap_ldap_context *ctx)
 static NTSTATUS idmap_ldap_set_mapping(struct idmap_domain *dom,
 				       const struct id_map *map);
 
-static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom,
-				   const char *params)
+static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
 {
 	NTSTATUS ret;
 	struct idmap_ldap_context *ctx = NULL;
diff --git a/source3/winbindd/idmap_nss.c b/source3/winbindd/idmap_nss.c
index bfef7bb399..1c49e76078 100644
--- a/source3/winbindd/idmap_nss.c
+++ b/source3/winbindd/idmap_nss.c
@@ -31,8 +31,7 @@
  Initialise idmap database. 
 *****************************/
 
-static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom,
-				   const char *params)
+static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom)
 {	
 	return NT_STATUS_OK;
 }
diff --git a/source3/winbindd/idmap_passdb.c b/source3/winbindd/idmap_passdb.c
index ba179c331e..276ae2c104 100644
--- a/source3/winbindd/idmap_passdb.c
+++ b/source3/winbindd/idmap_passdb.c
@@ -29,7 +29,7 @@
  Initialise idmap database. 
 *****************************/
 
-static NTSTATUS idmap_pdb_init(struct idmap_domain *dom, const char *params)
+static NTSTATUS idmap_pdb_init(struct idmap_domain *dom)
 {	
 	return NT_STATUS_OK;
 }
diff --git a/source3/winbindd/idmap_rid.c b/source3/winbindd/idmap_rid.c
index 935d7534fc..8bb63fd534 100644
--- a/source3/winbindd/idmap_rid.c
+++ b/source3/winbindd/idmap_rid.c
@@ -35,8 +35,7 @@ struct idmap_rid_context {
   we support multiple domains in the new idmap
  *****************************************************************************/
 
-static NTSTATUS idmap_rid_initialize(struct idmap_domain *dom,
-				     const char *params)
+static NTSTATUS idmap_rid_initialize(struct idmap_domain *dom)
 {
 	NTSTATUS ret;
 	struct idmap_rid_context *ctx;
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 537f6cfb38..c83ebc53bf 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -486,7 +486,7 @@ static NTSTATUS idmap_tdb_get_new_id(struct idmap_domain *dom,
 static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom,
 				      const struct id_map *map);
 
-static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom, const char *params)
+static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom)
 {
 	NTSTATUS ret;
 	struct idmap_tdb_context *ctx;
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 05d408ac1e..82121f8c0e 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -273,8 +273,7 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom,
 /*
   Initialise idmap database. 
 */
-static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom,
-				   const char *params)
+static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom)
 {
 	NTSTATUS ret;
 	struct idmap_tdb2_context *ctx;