From 4268a3130bfb45dc4f3a53355c38983c75f9a3c3 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Sun, 25 Aug 2024 19:39:29 +0000 Subject: [PATCH] docs: man: sort NAME VALIDATION section (firejail.1) This amends commit 6489138a5 ("docs: document NAME VALIDATION in firejail.txt", 2023-06-13) / PR #5856. Relates to #6451. --- src/man/firejail.1.in | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/man/firejail.1.in b/src/man/firejail.1.in index f024b19daf..16ea26288b 100644 --- a/src/man/firejail.1.in +++ b/src/man/firejail.1.in @@ -3353,16 +3353,6 @@ $ firejail --net=eth0 --x11=xephyr --xephyr-screen=640x480 firefox .br #endif .\" Note: Keep this in sync with invalid_name() in src/firejail/util.c. -.SH NAME VALIDATION -For simplicity, the same name validation is used for multiple options. -Rules: -.PP -The name must be 1-253 characters long. -The name can only contain ASCII letters, digits and the special characters -"-._" (that is, the name cannot contain spaces or control characters). -The name cannot contain only digits. -The first and last characters must be an ASCII letter or digit and the name -may contain special characters in the middle. #ifdef HAVE_APPARMOR .SH APPARMOR .TP @@ -3771,6 +3761,17 @@ Sandbox running time in hours:minutes:seconds format. USER The owner of the sandbox. +.SH NAME VALIDATION +For simplicity, the same name validation is used for multiple options. +Rules: +.PP +The name must be 1-253 characters long. +The name can only contain ASCII letters, digits and the special characters +"-._" (that is, the name cannot contain spaces or control characters). +The name cannot contain only digits. +The first and last characters must be an ASCII letter or digit and the name +may contain special characters in the middle. + .SH RESTRICTED SHELL To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in /etc/passwd file for each user that needs to be restricted. Alternatively,