The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/2454
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Hello,
A duplicated function is removed.
Signed-off-by: 2xsec <dh48.je...@samsung.com>
From 23ccbdeda820819729d379f3c82b873a733ac0c3 Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.je...@samsung.com>
Date: Sat, 7 Jul 2018 19:52:11 +0900
Subject: [PATCH] tools: lxc-unshare: replace write_id_mapping() to the same
function in conf.c
Signed-off-by: 2xsec <dh48.je...@samsung.com>
---
src/lxc/tools/lxc_unshare.c | 25 ++-----------------------
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/src/lxc/tools/lxc_unshare.c b/src/lxc/tools/lxc_unshare.c
index 669186ec1..85b9d4c02 100644
--- a/src/lxc/tools/lxc_unshare.c
+++ b/src/lxc/tools/lxc_unshare.c
@@ -41,6 +41,7 @@
#include "arguments.h"
#include "caps.h"
+#include "conf.h"
#include "namespace.h"
#include "utils.h"
@@ -220,28 +221,6 @@ static int do_start(void *arg)
return 1;
}
-static int write_id_mapping(pid_t pid, const char *buf, size_t buf_size)
-{
- char path[MAXPATHLEN];
- int fd, ret;
-
- ret = snprintf(path, MAXPATHLEN, "/proc/%d/uid_map", pid);
- if (ret < 0 || ret >= MAXPATHLEN)
- return -E2BIG;
-
- fd = open(path, O_WRONLY);
- if (fd < 0)
- return -1;
-
- errno = 0;
- ret = lxc_write_nointr(fd, buf, buf_size);
- close(fd);
- if (ret < 0 || (size_t)ret != buf_size)
- return -1;
-
- return 0;
-}
-
int main(int argc, char *argv[])
{
char **args;
@@ -357,7 +336,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- ret = write_id_mapping(pid, umap, strlen(umap));
+ ret = write_id_mapping(ID_TYPE_UID, pid, umap, strlen(umap));
if (ret < 0) {
close(start_arg.wait_fd);
fprintf(stderr, "uid mapping failed\n");
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
