tools: fix -g -u parameters for lxc-execute and lxc-attach

Closes #3188.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
index 44c8e8dae5277bd8b17edde7425c0d5439ef912c..a8f493aa71c6b00dea2a3e55566f35e8b37ce15b 100644 (file)
--- a/src/lxc/tools/lxc_attach.c
+++ b/src/lxc/tools/lxc_attach.c
@@ -132,6 +132,8 @@ Options :\n\
        .checker      = NULL,
        .log_priority = "ERROR",
        .log_file     = "none",
+       .uid          = LXC_INVALID_UID,
+       .gid          = LXC_INVALID_GID,
 };
 
 static int my_parser(struct lxc_arguments *args, int c, char *arg)
@@ -345,10 +347,10 @@ int main(int argc, char *argv[])
                        goto out;
        }
 
-       if (my_args.uid)
+       if (my_args.uid != LXC_INVALID_UID)
                attach_options.uid = my_args.uid;
 
-       if (my_args.gid)
+       if (my_args.gid != LXC_INVALID_GID)
                attach_options.gid = my_args.gid;
 
        if (command.program) {

diff --git a/src/lxc/tools/lxc_execute.c b/src/lxc/tools/lxc_execute.c
index 9cb281f9f05e64350a3a95d905a3877dddc5e9a9..6352114ecf5b028d5559a0cc44f0568280500fd4 100644 (file)
--- a/src/lxc/tools/lxc_execute.c
+++ b/src/lxc/tools/lxc_execute.c
@@ -63,6 +63,8 @@ Options :\n\
        .log_priority = "ERROR",
        .log_file     = "none",
        .daemonize    = 0,
+       .uid          = LXC_INVALID_UID,
+       .gid          = LXC_INVALID_GID,
 };
 
 static int my_parser(struct lxc_arguments *args, int c, char *arg)
@@ -190,7 +192,7 @@ int main(int argc, char *argv[])
        if (!bret)
                goto out;
 
-       if (my_args.uid) {
+       if (my_args.uid != LXC_INVALID_UID) {
                char buf[256];
 
                ret = snprintf(buf, 256, "%d", my_args.uid);
@@ -202,7 +204,7 @@ int main(int argc, char *argv[])
                        goto out;
        }
 
-       if (my_args.gid) {
+       if (my_args.gid != LXC_INVALID_GID) {
                char buf[256];
 
                ret = snprintf(buf, 256, "%d", my_args.gid);