diff --git a/lib/chkname.c b/lib/chkname.c index 433eb5e6..79fa29c3 100644 --- a/lib/chkname.c +++ b/lib/chkname.c @@ -1,11 +1,9 @@ -/* - * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh - * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz - * SPDX-FileCopyrightText: 2001 - 2005, Tomasz Kłoczko - * SPDX-FileCopyrightText: 2005 - 2008, Nicolas François - * - * SPDX-License-Identifier: BSD-3-Clause - */ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-2000, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2001-2005, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2005-2008, Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause /* * is_valid_user_name(), is_valid_group_name() - check the new user/group @@ -74,7 +72,9 @@ static bool is_valid_name (const char *name) return !numeric; } -bool is_valid_user_name (const char *name) + +bool +is_valid_user_name(const char *name) { long maxsize; @@ -82,12 +82,14 @@ bool is_valid_user_name (const char *name) maxsize = sysconf(_SC_LOGIN_NAME_MAX); if (maxsize == -1 && errno != 0) maxsize = LOGIN_NAME_MAX; - if (maxsize != -1 && strlen(name) >= (size_t)maxsize) + + if (strlen(name) >= (size_t)maxsize) return false; return is_valid_name (name); } + bool is_valid_group_name (const char *name) { /* @@ -101,4 +103,3 @@ bool is_valid_group_name (const char *name) return is_valid_name (name); } -