Hi Using uci as a non root user i can get network configuration but not network state. The idea of this patch is to copy permission from config file, or if it doesn't exist use UCI_FILEMODE / UCI_DIRMODE
This patch is only compile tested (i don't have any 'test' router left). If you apply this patch (or a modified version), please also backport to AA Signed-off-by: Etienne CHAMPETIER <[email protected]> diff --git a/delta.c b/delta.c index 1da3b75..c99ba4c 100644 --- a/delta.c +++ b/delta.c @@ -425,10 +425,15 @@ int uci_save(struct uci_context *ctx, struct uci_package *p) if (uci_list_empty(&p->delta)) return 0; - if (stat(ctx->savedir, &statbuf) < 0) - mkdir(ctx->savedir, UCI_DIRMODE); - else if ((statbuf.st_mode & S_IFMT) != S_IFDIR) + if (stat(ctx->savedir, &statbuf) < 0) { + if(stat(ctx->confdir, &statbuf)){ + mkdir(ctx->savedir, statbuf.st_mode); + } else { + mkdir(ctx->savedir, UCI_DIRMODE); + } + } else if ((statbuf.st_mode & S_IFMT) != S_IFDIR) { UCI_THROW(ctx, UCI_ERR_IO); + } if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename) UCI_THROW(ctx, UCI_ERR_MEM); diff --git a/util.c b/util.c index 3725ec1..a5e9a46 100644 --- a/util.c +++ b/util.c @@ -182,17 +182,30 @@ __private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, i struct stat statbuf; FILE *file = NULL; int fd, ret; - int mode = (write ? O_RDWR : O_RDONLY); - - if (create) - mode |= O_CREAT; + int flags = (write ? O_RDWR : O_RDONLY); + mode_t mode = UCI_FILEMODE; + char *name = NULL; + char *filename2 = NULL; + + if (create) { + flags |= O_CREAT; + name = basename(filename); + if ((asprintf(&filename2, "%s/%s", ctx->confdir, name) < 0) || !filename2){ + UCI_THROW(ctx, UCI_ERR_MEM); + } else { + if(stat(filename2,&statbuf)) + mode = statbuf.st_mode; + + free(filename2); + } + } if (!write && ((stat(filename, &statbuf) < 0) || ((statbuf.st_mode & S_IFMT) != S_IFREG))) { UCI_THROW(ctx, UCI_ERR_NOTFOUND); } - fd = open(filename, mode, UCI_FILEMODE); + fd = open(filename, flags, mode); if (fd < 0) goto error; _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
