summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-08 10:16:03 +0200
committerMichael Adam <obnox@samba.org>2008-04-10 01:28:57 +0200
commitf5aac0a8d01885d06594c4bbe0ff815bb9339a0c (patch)
treea0ca401a74d0aee29b35ce712aa9cdff9a6ae5cd
parent8e9766289972ecf3f4bcaa1a9ed118bba5fea208 (diff)
downloadsamba-f5aac0a8d01885d06594c4bbe0ff815bb9339a0c.tar.gz
samba-f5aac0a8d01885d06594c4bbe0ff815bb9339a0c.tar.bz2
samba-f5aac0a8d01885d06594c4bbe0ff815bb9339a0c.zip
libsmbconf: add talloc context to the get_includes methods.
Michael (This used to be commit ed535b6b30b5c9412803f6373eadc704de6de2f9)
-rw-r--r--source3/lib/smbconf/smbconf.c4
-rw-r--r--source3/lib/smbconf/smbconf.h1
-rw-r--r--source3/lib/smbconf/smbconf_private.h1
-rw-r--r--source3/lib/smbconf/smbconf_reg.c1
-rw-r--r--source3/lib/smbconf/smbconf_txt_simple.c1
5 files changed, 7 insertions, 1 deletions
diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index 1ce761ebd4..d5a334b928 100644
--- a/source3/lib/smbconf/smbconf.c
+++ b/source3/lib/smbconf/smbconf.c
@@ -337,6 +337,7 @@ WERROR smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
}
WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *service,
uint32_t *num_includes, char ***includes)
{
@@ -344,7 +345,8 @@ WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
return WERR_NO_SUCH_SERVICE;
}
- return ctx->ops->get_includes(ctx, service, num_includes, includes);
+ return ctx->ops->get_includes(ctx, mem_ctx, service, num_includes,
+ includes);
}
WERROR smbconf_set_includes(struct smbconf_ctx *ctx,
diff --git a/source3/lib/smbconf/smbconf.h b/source3/lib/smbconf/smbconf.h
index 626d48e962..cd39758d3e 100644
--- a/source3/lib/smbconf/smbconf.h
+++ b/source3/lib/smbconf/smbconf.h
@@ -87,6 +87,7 @@ WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
WERROR smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
const char *param);
WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *service,
uint32_t *num_includes, char ***includes);
WERROR smbconf_set_includes(struct smbconf_ctx *ctx,
diff --git a/source3/lib/smbconf/smbconf_private.h b/source3/lib/smbconf/smbconf_private.h
index 1f26fca1ea..bed8f8e5ed 100644
--- a/source3/lib/smbconf/smbconf_private.h
+++ b/source3/lib/smbconf/smbconf_private.h
@@ -52,6 +52,7 @@ struct smbconf_ops {
WERROR (*delete_parameter)(struct smbconf_ctx *ctx,
const char *service, const char *param);
WERROR (*get_includes)(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *service,
uint32_t *num_includes, char ***includes);
WERROR (*set_includes)(struct smbconf_ctx *ctx,
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index 0f499e3146..5651357d0b 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -777,6 +777,7 @@ done:
}
static WERROR smbconf_reg_get_includes(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *service,
uint32_t *num_includes,
char ***includes)
diff --git a/source3/lib/smbconf/smbconf_txt_simple.c b/source3/lib/smbconf/smbconf_txt_simple.c
index 9273b7947b..faf7ebb253 100644
--- a/source3/lib/smbconf/smbconf_txt_simple.c
+++ b/source3/lib/smbconf/smbconf_txt_simple.c
@@ -495,6 +495,7 @@ static WERROR smbconf_txt_delete_parameter(struct smbconf_ctx *ctx,
}
static WERROR smbconf_txt_get_includes(struct smbconf_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
const char *service,
uint32_t *num_includes,
char ***includes)