summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/lib/netapi/serverinfo.c2
-rw-r--r--source3/lib/smbconf/smbconf.c4
-rw-r--r--source3/lib/smbconf/smbconf.h2
-rw-r--r--source3/libnet/libnet_join.c4
-rw-r--r--source3/utils/net_conf.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index c5b0c2f709..ffc5f6fd3e 100644
--- 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 47254be68d..660cb6f79f 100644
--- 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 caa0240a14..33fa82e898 100644
--- 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 7e3e9cc93a..12081c3a10 100644
--- 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 3af3bd0839..118196976d 100644
--- 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;
}