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.
131 lines
3.3 KiB
Diff
131 lines
3.3 KiB
Diff
diff --git a/daemon/direct.c b/daemon/direct.c
|
|
index 4ab4204..88e59ab 100644
|
|
--- a/daemon/direct.c
|
|
+++ b/daemon/direct.c
|
|
@@ -1218,11 +1218,11 @@ static void *do_mount_direct(void *arg)
|
|
struct passwd *ppw = &pw;
|
|
struct passwd **pppw = &ppw;
|
|
struct group gr;
|
|
- struct group *pgr = &gr;
|
|
- struct group **ppgr = &pgr;
|
|
+ struct group *pgr;
|
|
+ struct group **ppgr;
|
|
char *pw_tmp, *gr_tmp;
|
|
struct thread_stdenv_vars *tsv;
|
|
- int tmplen;
|
|
+ int tmplen, grplen;
|
|
struct stat st;
|
|
int status, state;
|
|
|
|
@@ -1326,7 +1326,7 @@ static void *do_mount_direct(void *arg)
|
|
|
|
/* Try to get group info */
|
|
|
|
- tmplen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
|
+ grplen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
|
if (tmplen < 0) {
|
|
error(ap->logopt, "failed to get buffer size for getgrgid_r");
|
|
free(tsv->user);
|
|
@@ -1335,16 +1335,28 @@ static void *do_mount_direct(void *arg)
|
|
goto cont;
|
|
}
|
|
|
|
- gr_tmp = malloc(tmplen + 1);
|
|
- if (!gr_tmp) {
|
|
- error(ap->logopt, "failed to malloc buffer for getgrgid_r");
|
|
- free(tsv->user);
|
|
- free(tsv->home);
|
|
- free(tsv);
|
|
- goto cont;
|
|
+ gr_tmp = NULL;
|
|
+ tmplen = grplen;
|
|
+ while (1) {
|
|
+ char *tmp = realloc(gr_tmp, tmplen + 1);
|
|
+ if (!tmp) {
|
|
+ error(ap->logopt, "failed to malloc buffer for getgrgid_r");
|
|
+ if (gr_tmp)
|
|
+ free(gr_tmp);
|
|
+ free(tsv->user);
|
|
+ free(tsv->home);
|
|
+ free(tsv);
|
|
+ goto cont;
|
|
+ }
|
|
+ gr_tmp = tmp;
|
|
+ pgr = &gr;
|
|
+ ppgr = &pgr;
|
|
+ status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
|
|
+ if (status != ERANGE)
|
|
+ break;
|
|
+ tmplen += grplen;
|
|
}
|
|
|
|
- status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
|
|
if (status || !pgr) {
|
|
error(ap->logopt, "failed to get group info from getgrgid_r");
|
|
free(tsv->user);
|
|
diff --git a/daemon/indirect.c b/daemon/indirect.c
|
|
index 5c422c8..f6b93d0 100644
|
|
--- a/daemon/indirect.c
|
|
+++ b/daemon/indirect.c
|
|
@@ -666,11 +666,11 @@ static void *do_mount_indirect(void *arg)
|
|
struct passwd *ppw = &pw;
|
|
struct passwd **pppw = &ppw;
|
|
struct group gr;
|
|
- struct group *pgr = &gr;
|
|
- struct group **ppgr = &pgr;
|
|
+ struct group *pgr;
|
|
+ struct group **ppgr;
|
|
char *pw_tmp, *gr_tmp;
|
|
struct thread_stdenv_vars *tsv;
|
|
- int len, tmplen, status, state;
|
|
+ int len, tmplen, grplen, status, state;
|
|
|
|
mt = (struct pending_args *) arg;
|
|
|
|
@@ -771,7 +771,7 @@ static void *do_mount_indirect(void *arg)
|
|
|
|
/* Try to get group info */
|
|
|
|
- tmplen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
|
+ grplen = sysconf(_SC_GETGR_R_SIZE_MAX);
|
|
if (tmplen < 0) {
|
|
error(ap->logopt, "failed to get buffer size for getgrgid_r");
|
|
free(tsv->user);
|
|
@@ -780,16 +780,28 @@ static void *do_mount_indirect(void *arg)
|
|
goto cont;
|
|
}
|
|
|
|
- gr_tmp = malloc(tmplen + 1);
|
|
- if (!gr_tmp) {
|
|
- error(ap->logopt, "failed to malloc buffer for getgrgid_r");
|
|
- free(tsv->user);
|
|
- free(tsv->home);
|
|
- free(tsv);
|
|
- goto cont;
|
|
+ gr_tmp = NULL;
|
|
+ tmplen = grplen;
|
|
+ while (1) {
|
|
+ char *tmp = realloc(gr_tmp, tmplen + 1);
|
|
+ if (!tmp) {
|
|
+ error(ap->logopt, "failed to malloc buffer for getgrgid_r");
|
|
+ if (gr_tmp)
|
|
+ free(gr_tmp);
|
|
+ free(tsv->user);
|
|
+ free(tsv->home);
|
|
+ free(tsv);
|
|
+ goto cont;
|
|
+ }
|
|
+ gr_tmp = tmp;
|
|
+ pgr = &gr;
|
|
+ ppgr = &pgr;
|
|
+ status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
|
|
+ if (status != ERANGE)
|
|
+ break;
|
|
+ tmplen += grplen;
|
|
}
|
|
|
|
- status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
|
|
if (status || !pgr) {
|
|
error(ap->logopt, "failed to get group info from getgrgid_r");
|
|
free(tsv->user);
|