Properly handle sysconf(_SC_LOGIN_NAME_MAX) returning -1 on failure.

millert · millert · commit ada47ee10864 · 2023-12-28T09:00:49.000-07:00
The cast to size_t needs to be outside the MAX() macro or the -1
will get cast to unsigned.

--HG--
branch : 1.9
diff --git a/plugins/sudoers/cvtsudoers_pwutil.c b/plugins/sudoers/cvtsudoers_pwutil.c
@@ -421,7 +421,7 @@ cvtsudoers_make_grlist_item(const struct passwd *pw, char * const *unused1)
     }
 
 #ifdef _SC_LOGIN_NAME_MAX
-    groupname_len = MAX((size_t)sysconf(_SC_LOGIN_NAME_MAX), 32);
+    groupname_len = (size_t)MAX(sysconf(_SC_LOGIN_NAME_MAX), 32);
 #else
     groupname_len = MAX(LOGIN_NAME_MAX, 32);
 #endif
diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c
@@ -381,7 +381,7 @@ PREFIX(make_grlist_item)(const struct passwd *pw, char * const *unused1)
     }
 
 #ifdef _SC_LOGIN_NAME_MAX
-    groupname_len = MAX((size_t)sysconf(_SC_LOGIN_NAME_MAX), 32);
+    groupname_len = (size_t)MAX(sysconf(_SC_LOGIN_NAME_MAX), 32);
 #else
     groupname_len = MAX(LOGIN_NAME_MAX, 32);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ cvtsudoers_make_grlist_item(const struct passwd pw, char const *unused1)`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`#ifdef _SC_LOGIN_NAME_MAX`
`424`		`- groupname_len = MAX((size_t)sysconf(_SC_LOGIN_NAME_MAX), 32);`
	`424`	`+ groupname_len = (size_t)MAX(sysconf(_SC_LOGIN_NAME_MAX), 32);`
`425`	`425`	`#else`
`426`	`426`	`groupname_len = MAX(LOGIN_NAME_MAX, 32);`
`427`	`427`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ PREFIX(make_grlist_item)(const struct passwd pw, char const *unused1)`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`#ifdef _SC_LOGIN_NAME_MAX`
`384`		`- groupname_len = MAX((size_t)sysconf(_SC_LOGIN_NAME_MAX), 32);`
	`384`	`+ groupname_len = (size_t)MAX(sysconf(_SC_LOGIN_NAME_MAX), 32);`
`385`	`385`	`#else`
`386`	`386`	`groupname_len = MAX(LOGIN_NAME_MAX, 32);`
`387`	`387`	`#endif`