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
531 B
Diff
23 lines
531 B
Diff
diff --git a/daemon/spawn.c b/daemon/spawn.c
|
|
index 3d5ea56..ab3274c 100644
|
|
--- a/daemon/spawn.c
|
|
+++ b/daemon/spawn.c
|
|
@@ -290,7 +290,16 @@ int spawn_mount(unsigned logopt, ...)
|
|
|
|
va_start(arg, logopt);
|
|
p = argv + 1;
|
|
- while ((*p++ = va_arg(arg, char *)));
|
|
+ while ((*p = va_arg(arg, char *))) {
|
|
+ if (options == SPAWN_OPT_NONE && !strcmp(*p, "-o")) {
|
|
+ *(++p) = va_arg(arg, char *);
|
|
+ if (!*p)
|
|
+ break;
|
|
+ if (strstr(*p, "loop"))
|
|
+ options = SPAWN_OPT_ACCESS;
|
|
+ }
|
|
+ p++;
|
|
+ }
|
|
va_end(arg);
|
|
|
|
while (retries--) {
|