diff options
author | 2022-01-05 18:31:12 -0300 | |
---|---|---|
committer | 2022-01-05 18:54:47 -0300 | |
commit | 1271645da968d5147a784a4e8e5bcf6593947065 (patch) | |
tree | 205bd51ff3aa50d18553a37efaeadc3fc7d7c35b /src | |
parent | Merge pull request #4824 from glitsj16/notable (diff) | |
download | firejail-1271645da968d5147a784a4e8e5bcf6593947065.tar.gz firejail-1271645da968d5147a784a4e8e5bcf6593947065.tar.zst firejail-1271645da968d5147a784a4e8e5bcf6593947065.zip |
noprinters: add missing items from new command checklist
See CONTRIBUTING.md.
The changes are based on what was done on commit 5a612029b ("rename
noautopulse to keep-config-pulse", 2021-05-13) / PR #4278.
This amends commit bd15e763e ("--noprinter option", 2021-10-20) and
commit d9403dcdc ("small fix", 2021-10-20).
Relates to #4607.
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/usage.c | 1 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 3 | ||||
-rw-r--r-- | src/man/firejail.txt | 4 | ||||
-rw-r--r-- | src/zsh_completion/_firejail.in | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index b993cb80c..d74840441 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -161,6 +161,7 @@ static char *usage_str = | |||
161 | " --nogroups - disable supplementary groups.\n" | 161 | " --nogroups - disable supplementary groups.\n" |
162 | " --noinput - disable input devices.\n" | 162 | " --noinput - disable input devices.\n" |
163 | " --nonewprivs - sets the NO_NEW_PRIVS prctl.\n" | 163 | " --nonewprivs - sets the NO_NEW_PRIVS prctl.\n" |
164 | " --noprinters - disable printers.\n" | ||
164 | " --noprofile - do not use a security profile.\n" | 165 | " --noprofile - do not use a security profile.\n" |
165 | #ifdef HAVE_USERNS | 166 | #ifdef HAVE_USERNS |
166 | " --noroot - install a user namespace with only the current user.\n" | 167 | " --noroot - install a user namespace with only the current user.\n" |
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index e35f2837b..71dab18ba 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -489,6 +489,9 @@ Sets the NO_NEW_PRIVS prctl. This ensures that child processes | |||
489 | cannot acquire new privileges using execve(2); in particular, | 489 | cannot acquire new privileges using execve(2); in particular, |
490 | this means that calling a suid binary (or one with file capabilities) | 490 | this means that calling a suid binary (or one with file capabilities) |
491 | does not result in an increase of privilege. | 491 | does not result in an increase of privilege. |
492 | .TP | ||
493 | \fBnoprinters | ||
494 | Disable printers. | ||
492 | #ifdef HAVE_USERNS | 495 | #ifdef HAVE_USERNS |
493 | .TP | 496 | .TP |
494 | \fBnoroot | 497 | \fBnoroot |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index b366fed7c..4fa20c70f 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -1634,6 +1634,10 @@ does not result in an increase of privilege. This option | |||
1634 | is enabled by default if seccomp filter is activated. | 1634 | is enabled by default if seccomp filter is activated. |
1635 | 1635 | ||
1636 | .TP | 1636 | .TP |
1637 | \fB\-\-noprinters | ||
1638 | Disable printers. | ||
1639 | |||
1640 | .TP | ||
1637 | \fB\-\-noprofile | 1641 | \fB\-\-noprofile |
1638 | Do not use a security profile. | 1642 | Do not use a security profile. |
1639 | .br | 1643 | .br |
diff --git a/src/zsh_completion/_firejail.in b/src/zsh_completion/_firejail.in index 8c1d758cc..334812dd6 100644 --- a/src/zsh_completion/_firejail.in +++ b/src/zsh_completion/_firejail.in | |||
@@ -123,6 +123,7 @@ _firejail_args=( | |||
123 | '--nogroups[disable supplementary groups]' | 123 | '--nogroups[disable supplementary groups]' |
124 | '--noinput[disable input devices]' | 124 | '--noinput[disable input devices]' |
125 | '--nonewprivs[sets the NO_NEW_PRIVS prctl]' | 125 | '--nonewprivs[sets the NO_NEW_PRIVS prctl]' |
126 | '--noprinters[disable printers]' | ||
126 | '--nosound[disable sound system]' | 127 | '--nosound[disable sound system]' |
127 | '--nou2f[disable U2F devices]' | 128 | '--nou2f[disable U2F devices]' |
128 | '--novideo[disable video devices]' | 129 | '--novideo[disable video devices]' |