summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-21 01:04:57 +0100
committerMichael Adam <obnox@samba.org>2008-03-21 02:25:56 +0100
commit23b1d721b8262f69cb7e28348c8e5cdf3483d4ea (patch)
treeb900ff8adc3e2b2af59bef3af35b5c63d41a54e0 /source3/lib
parentadf5bf554cd6bfdc5c6e7b1ed54f7f9329b15c50 (diff)
downloadsamba-23b1d721b8262f69cb7e28348c8e5cdf3483d4ea.tar.gz
samba-23b1d721b8262f69cb7e28348c8e5cdf3483d4ea.tar.bz2
samba-23b1d721b8262f69cb7e28348c8e5cdf3483d4ea.zip
libsmbconf: rename smbconf_close() to smbconf_shutdown().
Michael (This used to be commit 797b26ad3fad27e085827efb61f6b4d8b37e93f0)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/netapi/serverinfo.c2
-rw-r--r--source3/lib/smbconf/smbconf.c4
-rw-r--r--source3/lib/smbconf/smbconf.h2
3 files changed, 4 insertions, 4 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);