On Wed, 2021-02-03 at 09:48 -0600, Goldwyn Rodrigues wrote:
> Hi Ian,
>
> Any feedback on this? The fix is not included in 5.1.7.
I'm pretty sure I didn't see this.
It's not you it's me, I use Evolution and it's broken, not sure
what I'm going to do about it since it has some bits I want that
I haven't seen in other email clients.
The change looks fine, I'll apply it to my local repo.
I have a couple of other patches against 5.1.7 already and once
I've confirmed they are good to go I'll push them and this one
to the upstream repo. so at least it is available (and then must
be included in the next release).
Sorry about this.
Ian
>
> Reproduction scenario:
>
> # automount -M 2 -d -f
> Segmentation fault (core dumped)
>
> On 8:59 23/10, Goldwyn Rodrigues wrote:
> > master wait expects a value, and if provided automount crashes with
> > the
> > following trace:
> >
> > #0 __GI_____strtoul_l_internal (nptr=0x0, endptr=0x7fffffffe120,
> > base=0, group=<optimized out>,
> > loc=0x7ffff77a63a0 <_nl_global_locale>) at
> > ../stdlib/strtol_l.c:292
> > #1 0x0000555555562c52 in getnumopt ()
> > #2 0x0000555555564ec0 in main ()
> >
> > This is because the options string is not correct and does not
> > expect
> > an argument for master wait (M), which sets optarg to NULL
> >
> > Fixes: e68f07f ("autofs-5.1.2 - add master read wait option")
> > Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
> >
> > diff --git a/daemon/automount.c b/daemon/automount.c
> > index 0391bfb..c2a0f58 100644
> > --- a/daemon/automount.c
> > +++ b/daemon/automount.c
> > @@ -2219,7 +2219,7 @@ int main(int argc, char *argv[])
> > time_t timeout;
> > time_t age = monotonic_time(NULL);
> > struct rlimit rlim;
> > - const char *options = "+hp:t:vmdD:SfVrO:l:n:CFM";
> > + const char *options = "+hp:t:vmdD:SfVrO:l:n:CFM:";
> > static const struct option long_options[] = {
> > {"help", 0, 0, 'h'},
> > {"pid-file", 1, 0, 'p'},
