From f48e80715924eab3bbdd63166f36d1d5da460a1f Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 14 Jun 2021 17:21:44 +0200 Subject: [PATCH] tree-wide: replace problematic terminology Signed-off-by: Christian Brauner --- doc/ja/lxc-user-nic.sgml.in | 2 +- doc/ja/lxc.container.conf.sgml.in | 2 +- doc/ko/lxc-user-nic.sgml.in | 2 +- doc/ko/lxc.container.conf.sgml.in | 2 +- doc/ko/lxc.sgml.in | 2 +- doc/lxc-user-nic.sgml.in | 2 +- doc/lxc.container.conf.sgml.in | 2 +- src/lxc/conf.c | 2 +- src/lxc/terminal.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/ja/lxc-user-nic.sgml.in b/doc/ja/lxc-user-nic.sgml.in index ffadf3f20..35060345c 100644 --- a/doc/ja/lxc-user-nic.sgml.in +++ b/doc/ja/lxc-user-nic.sgml.in @@ -91,7 +91,7 @@ by KATOH Yasufumi 注意: 通常 LXC は、マウント対象と相対パス指定のバインドマウントを、適切にコンテナルート以下に閉じ込めます。 これは、ホストのディレクトリやファイルに対して重ね合わせを行うようなマウントによる攻撃を防ぎます。(絶対パス指定のマウントソース中の各パスがシンボリックリンクである場合は無視されます。) diff --git a/doc/ko/lxc-user-nic.sgml.in b/doc/ko/lxc-user-nic.sgml.in index 9a3b2d0b7..fb04e0a83 100644 --- a/doc/ko/lxc-user-nic.sgml.in +++ b/doc/ko/lxc-user-nic.sgml.in @@ -76,7 +76,7 @@ by Sungbae Yoo 주의 - 보통 LXC는 마운트 대상과 상대 경로로 된 바인드 마운트 소스들이 컨테이너의 루트 아래에 있도록 보장할 것이다. 이는 호스트 디렉토리와 파일들을 겹쳐서 마운트하는 유형의 공격을 피하기 위한 것이다. (절대 경로로 된 마운트 소스 내에 존재하는 심볼릭 링크들은 무시될 것이다.) 하지만, 만약 컨테이너 설정에서 컨테이너 사용자가 제어할 수 있는, 예를 들어 /home/joe와 같은 디렉토리를 컨테이너 내의 path에 먼저 마운트 하고 나서, path 내에 또 마운트를 하는 경우가 있다면, diff --git a/doc/ko/lxc.sgml.in b/doc/ko/lxc.sgml.in index dbfafa141..19c4248eb 100644 --- a/doc/ko/lxc.sgml.in +++ b/doc/ko/lxc.sgml.in @@ -755,7 +755,7 @@ rootfs state change and exit. This is useful for scripting to synchronize the launch of a container or the end. The parameter is an ORed combination of different states. The - following example shows how to wait for a container if he went + following example shows how to wait for a container if they went to the background. diff --git a/doc/lxc-user-nic.sgml.in b/doc/lxc-user-nic.sgml.in index 466361899..33e9e686e 100644 --- a/doc/lxc-user-nic.sgml.in +++ b/doc/lxc-user-nic.sgml.in @@ -81,7 +81,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA It will consult the configuration file @LXC_USERNIC_CONF@ to determine the number of interfaces which the calling user is allowed to - create, and which bridge he may attach them to. It tracks the + create, and which bridge they may attach them to. It tracks the number of interfaces each user has created using the file @LXC_USERNIC_DB@. It ensures that the calling user is privileged over the network namespace to which the interface diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in index 0323b468f..55641f240 100644 --- a/doc/lxc.container.conf.sgml.in +++ b/doc/lxc.container.conf.sgml.in @@ -1125,7 +1125,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA the container at some path, and then mounts under path, then a TOCTTOU attack would be possible where the container user modifies a symbolic link under - his home directory at just the right time. + their home directory at just the right time. diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 75998d517..d9f5f49a1 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -3411,7 +3411,7 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid) } /* Check if we really need to use newuidmap and newgidmap. - * If the user is only remapping his own {g,u}id, we don't need it. + * If the user is only remapping their own {g,u}id, we don't need it. */ if (use_shadow && lxc_list_len(idmap) == 2) { use_shadow = false; diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c index 726a430ee..df3fc3c01 100644 --- a/src/lxc/terminal.c +++ b/src/lxc/terminal.c @@ -251,7 +251,7 @@ static int lxc_terminal_write_log_file(struct lxc_terminal *terminal, char *buf, /* This isn't a regular file. so rotating the file seems a * dangerous thing to do, size limits are also very * questionable. Let's not risk anything and tell the user that - * he's requesting us to do weird stuff. + * they're requesting us to do weird stuff. */ if (terminal->log_rotate > 0 || terminal->log_size > 0) return -EINVAL;