libsmbconf: rename smbconf_open() to smbconf_init().

That's more appropriate.

Michael
(This used to be commit d7bd9bb8aa2003ec0a9860df26857f67255febe2)

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index a29a840da03b5d8768b9302fd2692cfccc722bec..c5b0c2f709c26670cba5180caa83427d3d870e7f 100644 (file)
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -191,7 +191,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
                return WERR_NOT_SUPPORTED;
        }
 
-       werr = smbconf_open(ctx, &conf_ctx);
+       werr = smbconf_init(ctx, &conf_ctx);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }

diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index 4a5cbbd48996b5306fbb1529aa3ac2c960178a92..47254be68dc29127b13916c095793465d143b7e4 100644 (file)
--- a/source3/lib/smbconf/smbconf.c
+++ b/source3/lib/smbconf/smbconf.c
@@ -76,7 +76,7 @@ static WERROR smbconf_reg_open_path(TALLOC_CTX *mem_ctx,
 
        if (ctx->token == NULL) {
                DEBUG(1, ("Error: token missing from smbconf_ctx. "
-                         "was smbconf_open() called?\n"));
+                         "was smbconf_init() called?\n"));
                werr = WERR_INVALID_PARAM;
                goto done;
        }
@@ -795,7 +795,7 @@ struct smbconf_ops smbconf_ops_reg = {
  * After the work with the configuration is completed, smbconf_close()
  * should be called.
  */
-WERROR smbconf_open(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx)
+WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx)
 {
        WERROR werr = WERR_OK;
        struct smbconf_ctx *ctx;

diff --git a/source3/lib/smbconf/smbconf.h b/source3/lib/smbconf/smbconf.h
index c15caf4ea930c9951b3992db35564859ad5bda79..caa0240a14c27b2d44b8e9e660e8570d30d87ca4 100644 (file)
--- a/source3/lib/smbconf/smbconf.h
+++ b/source3/lib/smbconf/smbconf.h
@@ -33,7 +33,7 @@ struct smbconf_csn {
  *   (Backends and possibly remote support being added ...)
  */
 
-WERROR smbconf_open(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx);
+WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx);
 void smbconf_close(struct smbconf_ctx *ctx);
 bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
                     const char *service, const char *param);

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 2e634a16f1dae3fa2cdc823177d72ed0cc489895..7e3e9cc93ac45b67a585140e6df736569b5b3d0d 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1201,7 +1201,7 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
        WERROR werr;
        struct smbconf_ctx *ctx;
 
-       werr = smbconf_open(r, &ctx);
+       werr = smbconf_init(r, &ctx);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -1245,7 +1245,7 @@ static WERROR do_unjoin_modify_vals_config(struct libnet_UnjoinCtx *r)
        WERROR werr = WERR_OK;
        struct smbconf_ctx *ctx;
 
-       werr = smbconf_open(r, &ctx);
+       werr = smbconf_init(r, &ctx);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a97f8e9c0371f5926de9ada3198aa007f92288f8..bb3b6141f0e0795f1f5bc0741b646360731dc76c 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6497,7 +6497,7 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
 
        if (conf_ctx == NULL) {
                /* first time */
-               werr = smbconf_open(NULL, &conf_ctx);
+               werr = smbconf_init(NULL, &conf_ctx);
                if (!W_ERROR_IS_OK(werr)) {
                        goto done;
                }
@@ -6607,7 +6607,7 @@ bool lp_file_list_changed(void)
        if (lp_config_backend_is_registry()) {
                if (conf_ctx == NULL) {
                        WERROR werr;
-                       werr = smbconf_open(NULL, &conf_ctx);
+                       werr = smbconf_init(NULL, &conf_ctx);
                        if (!W_ERROR_IS_OK(werr)) {
                                DEBUG(0, ("error opening configuration: %s\n",
                                          dos_errstr(werr)));

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index d4437cd12299d75dbc5fcaf2e7c6a3c9ae53e675..3af3bd083941164793aad162614474c5246e23a4 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -889,7 +889,7 @@ static int net_conf_wrap_function(int (*fn)(struct smbconf_ctx *,
        struct smbconf_ctx *conf_ctx;
        int ret = -1;
 
-       werr = smbconf_open(mem_ctx, &conf_ctx);
+       werr = smbconf_init(mem_ctx, &conf_ctx);
 
        if (!W_ERROR_IS_OK(werr)) {
                return -1;