autofs-5.0.2-improve-server-unavail-fix.patch

   1 diff --git a/CHANGELOG b/CHANGELOG
   2 index 09b0541..d8a6987 100644
   3 --- a/CHANGELOG
   4 +++ b/CHANGELOG
   5 @@ -56,6 +56,7 @@
   6  - use mount option "nosuid" for "-hosts" map unless "suid" is explicily specified.
   7  - second attempt fixing quoting for exports gathered by hosts map.
   8  - quell annoying "cannot open mount module" message.
   9 +- fix for improve handling of server not available.
  10
  11  18/06/2007 autofs-5.0.2
  12  -----------------------
  13 diff --git a/modules/lookup_file.c b/modules/lookup_file.c
  14 index a77068a..ab2dd0f 100644
  15 --- a/modules/lookup_file.c
  16 +++ b/modules/lookup_file.c
  17 @@ -474,8 +474,12 @@ int lookup_read_master(struct master *master, time_t age, void *context)
  18                                      MODPREFIX
  19                                      "failed to read included master map %s",
  20                                      master->name);
  21 -                               fclose(f);
  22 -                               return NSS_STATUS_UNAVAIL;
  23 +                               if (!master->recurse) {
  24 +                                       master->depth--;
  25 +                                       master->recurse = 0;
  26 +                                       fclose(f);
  27 +                                       return NSS_STATUS_UNAVAIL;
  28 +                               }
  29                         }
  30                         master->depth--;
  31                         master->recurse = 0;