36ee8299b4
- check for "*" when looking up wildcard in LDAP.
- fix couple of edge case parse fails of timeout option.
- add SEARCH_BASE configuration option.
- add random selection as a master map entry option.
- re-read config on HUP signal.
- add LDAP_URI, LDAP_TIMEOUT and LDAP_NETWORK_TIMEOUT configuration
options.
- fix deadlock in submount mount module.
- fix lack of ferror() checking when reading files.
- fix typo in autofs(5) man page.
- fix map entry expansion when undefined macro is present.
- remove unused export validation code.
- add dynamic logging (adapted from v4 patch from Jeff Moyer).
- fix recursive loopback mounts (Matthias Koenig).
- add map re-load to verbose logging.
- fix handling of LDAP base dns with spaces.
- handle MTAB_NOTUPDATED status return from mount.
- when default master map, auto.master, is used also check for auto_master.
- update negative mount timeout handling.
- fix large group handling (Ryan Thomas).
- fix for dynamic logging breaking non-sasl build (Guillaume Rousse).
- eliminate NULL proc ping for singleton host or local mounts.
23 lines
812 B
Diff
23 lines
812 B
Diff
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
|
|
index d5e666b..a7b315e 100644
|
|
--- a/modules/lookup_ldap.c
|
|
+++ b/modules/lookup_ldap.c
|
|
@@ -1500,7 +1500,7 @@ static int lookup_one(struct autofs_point *ap,
|
|
*qKey = '/';
|
|
|
|
/* Build a query string. */
|
|
- l = strlen(class) + 2*strlen(entry) + strlen(qKey) + 29;
|
|
+ l = strlen(class) + 3*strlen(entry) + strlen(qKey) + 35;
|
|
|
|
query = alloca(l);
|
|
if (query == NULL) {
|
|
@@ -1514,7 +1514,7 @@ static int lookup_one(struct autofs_point *ap,
|
|
* whose entry is equal to qKey.
|
|
*/
|
|
ql = sprintf(query,
|
|
- "(&(objectclass=%s)(|(%s=%s)(%s=/)))", class, entry, qKey, entry);
|
|
+ "(&(objectclass=%s)(|(%s=%s)(%s=/)(%s=\\2A)))", class, entry, qKey, entry, entry);
|
|
if (ql >= l) {
|
|
error(ap->logopt,
|
|
MODPREFIX "error forming query string");
|