Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
cc94aaf3
Unverified
Commit
cc94aaf3
authored
Mar 17, 2020
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tools: fix -g -u parameters for lxc-execute and lxc-attach
Closes #3188. Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
2120b89b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
lxc_attach.c
src/lxc/tools/lxc_attach.c
+4
-2
lxc_execute.c
src/lxc/tools/lxc_execute.c
+4
-2
No files found.
src/lxc/tools/lxc_attach.c
View file @
cc94aaf3
...
@@ -132,6 +132,8 @@ Options :\n\
...
@@ -132,6 +132,8 @@ Options :\n\
.
checker
=
NULL
,
.
checker
=
NULL
,
.
log_priority
=
"ERROR"
,
.
log_priority
=
"ERROR"
,
.
log_file
=
"none"
,
.
log_file
=
"none"
,
.
uid
=
LXC_INVALID_UID
,
.
gid
=
LXC_INVALID_GID
,
};
};
static
int
my_parser
(
struct
lxc_arguments
*
args
,
int
c
,
char
*
arg
)
static
int
my_parser
(
struct
lxc_arguments
*
args
,
int
c
,
char
*
arg
)
...
@@ -345,10 +347,10 @@ int main(int argc, char *argv[])
...
@@ -345,10 +347,10 @@ int main(int argc, char *argv[])
goto
out
;
goto
out
;
}
}
if
(
my_args
.
uid
)
if
(
my_args
.
uid
!=
LXC_INVALID_UID
)
attach_options
.
uid
=
my_args
.
uid
;
attach_options
.
uid
=
my_args
.
uid
;
if
(
my_args
.
gid
)
if
(
my_args
.
gid
!=
LXC_INVALID_GID
)
attach_options
.
gid
=
my_args
.
gid
;
attach_options
.
gid
=
my_args
.
gid
;
if
(
command
.
program
)
{
if
(
command
.
program
)
{
...
...
src/lxc/tools/lxc_execute.c
View file @
cc94aaf3
...
@@ -63,6 +63,8 @@ Options :\n\
...
@@ -63,6 +63,8 @@ Options :\n\
.
log_priority
=
"ERROR"
,
.
log_priority
=
"ERROR"
,
.
log_file
=
"none"
,
.
log_file
=
"none"
,
.
daemonize
=
0
,
.
daemonize
=
0
,
.
uid
=
LXC_INVALID_UID
,
.
gid
=
LXC_INVALID_GID
,
};
};
static
int
my_parser
(
struct
lxc_arguments
*
args
,
int
c
,
char
*
arg
)
static
int
my_parser
(
struct
lxc_arguments
*
args
,
int
c
,
char
*
arg
)
...
@@ -190,7 +192,7 @@ int main(int argc, char *argv[])
...
@@ -190,7 +192,7 @@ int main(int argc, char *argv[])
if
(
!
bret
)
if
(
!
bret
)
goto
out
;
goto
out
;
if
(
my_args
.
uid
)
{
if
(
my_args
.
uid
!=
LXC_INVALID_UID
)
{
char
buf
[
256
];
char
buf
[
256
];
ret
=
snprintf
(
buf
,
256
,
"%d"
,
my_args
.
uid
);
ret
=
snprintf
(
buf
,
256
,
"%d"
,
my_args
.
uid
);
...
@@ -202,7 +204,7 @@ int main(int argc, char *argv[])
...
@@ -202,7 +204,7 @@ int main(int argc, char *argv[])
goto
out
;
goto
out
;
}
}
if
(
my_args
.
gid
)
{
if
(
my_args
.
gid
!=
LXC_INVALID_GID
)
{
char
buf
[
256
];
char
buf
[
256
];
ret
=
snprintf
(
buf
,
256
,
"%d"
,
my_args
.
gid
);
ret
=
snprintf
(
buf
,
256
,
"%d"
,
my_args
.
gid
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment