1 From bff4cd71cc41bf3104b35da24e73742571845ebd Mon Sep 17 00:00:00 2001
2 From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
3 Date: Wed, 11 Dec 2019 19:43:19 -0800
6 plugins/sudoers/ldap.c | 10 ++++++++--
7 1 file changed, 8 insertions(+), 2 deletions(-)
9 diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
10 index bc2baec..ad8a890 100644
11 --- a/plugins/sudoers/ldap.c
12 +++ b/plugins/sudoers/ldap.c
13 @@ -920,8 +920,8 @@ sudo_ldap_build_pass1(LDAP *ld, struct passwd *pw)
14 if (ldap_conf.search_filter)
15 sz += strlen(ldap_conf.search_filter);
17 - /* Then add (|(sudoUser=USERNAME)(sudoUser=ALL)) + NUL */
18 - sz += 29 + sudo_ldap_value_len(pw->pw_name);
19 + /* Then add (|(sudoUser=USERNAME)(sudoUser=#uid)(sudoUser=ALL)) + NUL */
20 + sz += 29 + (12 + MAX_UID_T_LEN) + sudo_ldap_value_len(pw->pw_name);
22 /* Add space for primary and supplementary groups and gids */
23 if ((grp = sudo_getgrgid(pw->pw_gid)) != NULL) {
24 @@ -982,6 +982,12 @@ sudo_ldap_build_pass1(LDAP *ld, struct passwd *pw)
25 CHECK_LDAP_VCAT(buf, pw->pw_name, sz);
26 CHECK_STRLCAT(buf, ")", sz);
28 + /* Append user uid */
29 + (void) snprintf(gidbuf, sizeof(gidbuf), "%u", (unsigned int)pw->pw_uid);
30 + (void) strlcat(buf, "(sudoUser=#", sz);
31 + (void) strlcat(buf, gidbuf, sz);
32 + (void) strlcat(buf, ")", sz);
34 /* Append primary group and gid */
36 CHECK_STRLCAT(buf, "(sudoUser=%", sz);