summaryrefslogtreecommitdiff
path: root/lib/smbconf/smbconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/smbconf/smbconf.c')
-rw-r--r--lib/smbconf/smbconf.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index a6bb64fec8..f23a802e7c 100644
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -355,7 +355,7 @@ sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
return err;
}
-WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_includes(struct smbconf_ctx *ctx,
TALLOC_CTX *mem_ctx,
const char *service,
uint32_t *num_includes, char ***includes)
@@ -364,21 +364,20 @@ WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
includes);
}
-WERROR smbconf_get_global_includes(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx,
TALLOC_CTX *mem_ctx,
uint32_t *num_includes, char ***includes)
{
- WERROR werr;
sbcErr err;
err = smbconf_global_check(ctx);
- if (SBC_ERROR_IS_OK(err)) {
- return WERR_GENERAL_FAILURE;
+ if (!SBC_ERROR_IS_OK(err)) {
+ return err;
}
- werr = smbconf_get_includes(ctx, mem_ctx, GLOBAL_NAME,
+ err = smbconf_get_includes(ctx, mem_ctx, GLOBAL_NAME,
num_includes, includes);
- return werr;
+ return err;
}
WERROR smbconf_set_includes(struct smbconf_ctx *ctx,