[lxc-devel] [lxc/master] usernsexec: init log fd

[tych0 on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 728 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180312/b0029cda/attachment.bin>
-------------- next part --------------
From 2d22b22dd4840e141916e64c697e0a43c7b93c8c Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho at tycho.ws>
Date: Mon, 12 Mar 2018 09:39:37 -0600
Subject: [PATCH] usernsexec: init log fd

lxc-usernsexec uses some functions (e.g. lxc_map_ids()), which are part of
the lxc library and thus use the WARN etc. macros to emit log messages.
However, it doesn't initialize the log in any way, so these messages go
into the ether.

lxc-usernsexec currently has no log parameters, so let's just log these to
stderr. Someone can do something fancier later if they want.

Signed-off-by: Tycho Andersen <tycho at tycho.ws>
---
 src/lxc/cmd/lxc_usernsexec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lxc/cmd/lxc_usernsexec.c b/src/lxc/cmd/lxc_usernsexec.c
index 766bd72e6..725796270 100644
--- a/src/lxc/cmd/lxc_usernsexec.c
+++ b/src/lxc/cmd/lxc_usernsexec.c
@@ -53,6 +53,8 @@
 #define MS_SLAVE (1 << 19)
 #endif
 
+extern int lxc_log_fd;
+
 int unshare(int flags);
 
 static void usage(const char *name)
@@ -274,6 +276,8 @@ int main(int argc, char *argv[])
 	int pipe1[2],  /* child tells parent it has unshared */
 	    pipe2[2];  /* parent tells child it is mapped and may proceed */
 
+	lxc_log_fd = STDERR_FILENO;
+
 	memset(ttyname0, '\0', sizeof(ttyname0));
 	memset(ttyname1, '\0', sizeof(ttyname1));
 	memset(ttyname2, '\0', sizeof(ttyname2));