libsmbconf: Convert smbconf_get_includes() to sbcErr.

[ira/wip.git] / lib / smbconf / smbconf.c

diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index a6bb64fec88062a53d5b1511c8a8f9f16122e22f..f23a802e7c7eeeb9980f46c23ec60e65abfe6bb1 100644 (file)
--- 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,