Allow --userns when pasta spawns a command

Currently --userns is only allowed when pasta is attaching to an existing
netns or PID, and is prohibited when creating a new netns by spawning a
command or shell.

With the new handling of userns, this check isn't neccessary.  I'm not sure
if there's any use case for --userns with a spawned command, but it's
strictly more flexible and requires zero extra code, so we might as well.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2022-09-12 22:24:08 +10:00 committed by Stefano Brivio
parent eed17a47fe
commit ef6da15732
2 changed files with 0 additions and 7 deletions

5
conf.c
View file

@ -561,11 +561,6 @@ static int conf_pasta_ns(int *netns_only, char *userns, char *netns,
}
}
if (*userns && !*netns) {
err("--userns requires --netns or PID");
return -EINVAL;
}
/* Attaching to a netns/PID, with no userns given */
if (*netns && !*userns)
*netns_only = 1;

View file

@ -453,8 +453,6 @@ Default is \fBauto\fR.
Target user namespace to join, as a path. If PID is given, without this option,
the user namespace will be the one of the corresponding process.
This option requires --netns or a PID to be specified.
.TP
.BR \-\-netns " " \fIspec
Target network namespace to join, as a path or a name. A name is treated as