Move LOGIN_NAME_MAX compat define to login_max.c

sudo-project · Jan 15, 2025 · a3cd820 · a3cd820
1 parent e375330
commit a3cd820
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/lib/util/login_max.c b/lib/util/login_max.c
@@ -30,6 +30,14 @@
 #include <sudo_compat.h>
 #include <sudo_util.h>
 
+#ifndef LOGIN_NAME_MAX
+# ifdef _POSIX_LOGIN_NAME_MAX
+#  define LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX
+# else
+#  define LOGIN_NAME_MAX 9
+# endif
+#endif /* LOGIN_NAME_MAX */
+
 size_t
 sudo_login_name_max_v1(void)
 {

diff --git a/plugins/sudoers/cvtsudoers_pwutil.c b/plugins/sudoers/cvtsudoers_pwutil.c
@@ -45,14 +45,6 @@
 #include <cvtsudoers.h>
 #include <pwutil.h>
 
-#ifndef LOGIN_NAME_MAX
-# ifdef _POSIX_LOGIN_NAME_MAX
-#  define LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX
-# else
-#  define LOGIN_NAME_MAX 9
-# endif
-#endif /* LOGIN_NAME_MAX */
-
 #define FIELD_SIZE(src, name, size)			\
 do {							\
 	if ((src)->name) {				\

diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c
@@ -41,14 +41,6 @@
 #include <sudoers.h>
 #include <pwutil.h>
 
-#ifndef LOGIN_NAME_MAX
-# ifdef _POSIX_LOGIN_NAME_MAX
-#  define LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX
-# else
-#  define LOGIN_NAME_MAX 9
-# endif
-#endif /* LOGIN_NAME_MAX */
-
 /*
  * For testsudoers and cvtsudoers need to support building with a different
  * function prefix and using custom getpwnam/getpwuid/getgrnam/getgrgid.