You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
19 lines
852 B
19 lines
852 B
diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c |
|
index f21a99ee..83202e28 100644 |
|
--- a/plugins/sudoers/ldap.c |
|
+++ b/plugins/sudoers/ldap.c |
|
@@ -1847,12 +1847,10 @@ sudo_ldap_build_pass2(void) |
|
ldap_conf.timed ? timebuffer : "", |
|
(ldap_conf.timed || ldap_conf.search_filter) ? ")" : ""); |
|
} else { |
|
- len = asprintf(&filt, "%s%s(sudoUser=*)(sudoUser=%s*)%s%s", |
|
- (ldap_conf.timed || ldap_conf.search_filter) ? "(&" : "", |
|
+ len = asprintf(&filt, "(&%s(sudoUser=*)(sudoUser=%s*)%s)", |
|
ldap_conf.search_filter ? ldap_conf.search_filter : "", |
|
query_netgroups ? "+" : "%:", |
|
- ldap_conf.timed ? timebuffer : "", |
|
- (ldap_conf.timed || ldap_conf.search_filter) ? ")" : ""); |
|
+ ldap_conf.timed ? timebuffer : ""); |
|
} |
|
if (len == -1) |
|
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
|
|
|