libsmbconf: rename smbconf_close() to smbconf_shutdown().

Michael
(This used to be commit 797b26ad3fad27e085827efb61f6b4d8b37e93f0)

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index c5b0c2f709c26670cba5180caa83427d3d870e7f..ffc5f6fd3ee24700f51a4eda08eeb57030e83d2b 100644 (file)
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -200,7 +200,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
                                            info1005->comment);
 
  done:
-       smbconf_close(conf_ctx);
+       smbconf_shutdown(conf_ctx);
        return werr;
 }
 

diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index 47254be68dc29127b13916c095793465d143b7e4..660cb6f79fdc2e5004fe471e5079a437b1d10f85 100644 (file)
--- a/source3/lib/smbconf/smbconf.c
+++ b/source3/lib/smbconf/smbconf.c
@@ -792,7 +792,7 @@ struct smbconf_ops smbconf_ops_reg = {
  * that should be passed around in subsequent calls to the other
  * smbconf functions.
  *
- * After the work with the configuration is completed, smbconf_close()
+ * After the work with the configuration is completed, smbconf_shutdown()
  * should be called.
  */
 WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx)
@@ -829,7 +829,7 @@ fail:
 /**
  * Close the configuration.
  */
-void smbconf_close(struct smbconf_ctx *ctx)
+void smbconf_shutdown(struct smbconf_ctx *ctx)
 {
        /* this also closes the registry (by destructor): */
        TALLOC_FREE(ctx);

diff --git a/source3/lib/smbconf/smbconf.h b/source3/lib/smbconf/smbconf.h
index caa0240a14c27b2d44b8e9e660e8570d30d87ca4..33fa82e8981c10c803de0614fa6c346600e966e1 100644 (file)
--- a/source3/lib/smbconf/smbconf.h
+++ b/source3/lib/smbconf/smbconf.h
@@ -34,7 +34,7 @@ struct smbconf_csn {
  */
 
 WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx);
-void smbconf_close(struct smbconf_ctx *ctx);
+void smbconf_shutdown(struct smbconf_ctx *ctx);
 bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
                     const char *service, const char *param);
 WERROR smbconf_drop(struct smbconf_ctx *ctx);

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 7e3e9cc93ac45b67a585140e6df736569b5b3d0d..12081c3a10ca199d4ea71084e4da042992bbae88 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1233,7 +1233,7 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
        }
 
  done:
-       smbconf_close(ctx);
+       smbconf_shutdown(ctx);
        return werr;
 }
 
@@ -1258,7 +1258,7 @@ static WERROR do_unjoin_modify_vals_config(struct libnet_UnjoinCtx *r)
        }
 
  done:
-       smbconf_close(ctx);
+       smbconf_shutdown(ctx);
        return werr;
 }
 

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 3af3bd083941164793aad162614474c5246e23a4..118196976dbf154ddf9ced0e7973c6631c605174 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -897,7 +897,7 @@ static int net_conf_wrap_function(int (*fn)(struct smbconf_ctx *,
 
        ret = fn(conf_ctx, argc, argv);
 
-       smbconf_close(conf_ctx);
+       smbconf_shutdown(conf_ctx);
 
        return ret;
 }