net conf: use the new smbconf_init() dispatcher instead of explicit backend init.
authorMichael Adam <obnox@samba.org>
Sun, 13 Apr 2008 15:16:54 +0000 (17:16 +0200)
committerMichael Adam <obnox@samba.org>
Sun, 13 Apr 2008 18:04:44 +0000 (20:04 +0200)
Michael
(This used to be commit 281c9287a34533045b62302bb33ced3d216421ac)

source3/utils/net_conf.c

index 245a91fa3ee5e0eac6493062197f3cf8ae894efc..88cc15e0eb7a82b9d4d94cbb734bf2bdc35c8908 100644 (file)
@@ -266,6 +266,7 @@ static int net_conf_import(struct smbconf_ctx *conf_ctx,
        int ret = -1;
        const char *filename = NULL;
        const char *servicename = NULL;
        int ret = -1;
        const char *filename = NULL;
        const char *servicename = NULL;
+       char *conf_source = NULL;
        TALLOC_CTX *mem_ctx;
        struct smbconf_ctx *txt_ctx;
        WERROR werr;
        TALLOC_CTX *mem_ctx;
        struct smbconf_ctx *txt_ctx;
        WERROR werr;
@@ -291,7 +292,13 @@ static int net_conf_import(struct smbconf_ctx *conf_ctx,
        DEBUG(3,("net_conf_import: reading configuration from file %s.\n",
                filename));
 
        DEBUG(3,("net_conf_import: reading configuration from file %s.\n",
                filename));
 
-       werr = smbconf_init_txt_simple(mem_ctx, &txt_ctx, filename);
+       conf_source = talloc_asprintf(mem_ctx, "file:%s", filename);
+       if (conf_source == NULL) {
+               d_printf("error: out of memory!\n");
+               goto done;
+       }
+
+       werr = smbconf_init(mem_ctx, &txt_ctx, conf_source);
        if (!W_ERROR_IS_OK(werr)) {
                d_printf("error loading file '%s': %s\n", filename,
                         dos_errstr(werr));
        if (!W_ERROR_IS_OK(werr)) {
                d_printf("error loading file '%s': %s\n", filename,
                         dos_errstr(werr));
@@ -969,7 +976,7 @@ static int net_conf_wrap_function(int (*fn)(struct smbconf_ctx *,
        struct smbconf_ctx *conf_ctx;
        int ret = -1;
 
        struct smbconf_ctx *conf_ctx;
        int ret = -1;
 
-       werr = smbconf_init_reg(mem_ctx, &conf_ctx, NULL);
+       werr = smbconf_init(mem_ctx, &conf_ctx, "registry:");
 
        if (!W_ERROR_IS_OK(werr)) {
                return -1;
 
        if (!W_ERROR_IS_OK(werr)) {
                return -1;