- fix conflict in patch for bug RHEL-12369.

autofs-5.1.8-allow-null-map-in-indirect-maps.patch

@@ -45,23 +45,19 @@ Signed-off-by: Ian Kent <raven@themaw.net>
  man/auto.master.5.in |    9 +++++++--
  6 files changed, 37 insertions(+), 3 deletions(-)
 
-diff --git a/CHANGELOG b/CHANGELOG
+--- autofs-5.1.4.orig/CHANGELOG
-index 1ebb02fb..a0f4b526 100644
++++ autofs-5.1.4/CHANGELOG
---- a/CHANGELOG
+@@ -150,6 +150,7 @@
-+++ b/CHANGELOG
-@@ -95,6 +95,7 @@
  - fix some sss error return cases.
  - fix incorrect matching of cached wildcard key.
  - fix expire retry looping.
 +- allow -null map in indirect maps.
  
- 19/10/2021 autofs-5.1.8
+ xx/xx/2018 autofs-5.1.5
- - add xdr_exports().
+ - fix flag file permission.
-diff --git a/daemon/indirect.c b/daemon/indirect.c
+--- autofs-5.1.4.orig/daemon/indirect.c
-index 0f7b620b..6ef05c36 100644
++++ autofs-5.1.4/daemon/indirect.c
---- a/daemon/indirect.c
+@@ -796,13 +796,23 @@ int handle_packet_missing_indirect(struc
-+++ b/daemon/indirect.c
-@@ -796,9 +796,9 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
  		return 0;
  	}
  
@@ -72,28 +68,23 @@ index 0f7b620b..6ef05c36 100644
  		if (me->status >= monotonic_time(NULL)) {
  			ops->send_fail(ap->logopt, ap->ioctlfd,
  				       pkt->wait_queue_token, -ENOENT);
-@@ -807,6 +807,16 @@ int handle_packet_missing_indirect(struct autofs_point *ap, autofs_packet_missin
+ 			cache_unlock(me->mc);
- 			pthread_setcancelstate(state, NULL);
++			master_mutex_unlock();
- 			return 0;
++			pthread_setcancelstate(state, NULL);
- 		}
++			return 0;
++		}
 +
 +		/* Ignore nulled indirect map entries */
 +		if (starts_with_null_opt(me->mapent)) {
 +			ops->send_fail(ap->logopt, ap->ioctlfd,
 +				       pkt->wait_queue_token, -ENOENT);
 +			cache_unlock(me->mc);
-+			master_mutex_unlock();
+ 			master_mutex_unlock();
-+			pthread_setcancelstate(state, NULL);
+ 			pthread_setcancelstate(state, NULL);
-+			return 0;
+ 			return 0;
-+		}
+--- autofs-5.1.4.orig/daemon/lookup.c
- 		cache_unlock(me->mc);
++++ autofs-5.1.4/daemon/lookup.c
- 	}
+@@ -780,6 +780,10 @@ int lookup_ghost(struct autofs_point *ap
- 
-diff --git a/daemon/lookup.c b/daemon/lookup.c
-index a3f660af..dc779480 100644
---- a/daemon/lookup.c
-+++ b/daemon/lookup.c
-@@ -774,6 +774,10 @@ int lookup_ghost(struct autofs_point *ap)
  				goto next;
  			}
  
@@ -104,11 +95,9 @@ index a3f660af..dc779480 100644
  			fullpath = make_browse_path(ap->logopt,
  						    ap->path, me->key, ap->pref);
  			if (!fullpath)
-diff --git a/include/parse_subs.h b/include/parse_subs.h
+--- autofs-5.1.4.orig/include/parse_subs.h
-index e2212021..3768275a 100644
++++ autofs-5.1.4/include/parse_subs.h
---- a/include/parse_subs.h
+@@ -122,6 +122,7 @@ int strmcmp(const char *, const char *,
-+++ b/include/parse_subs.h
-@@ -122,6 +122,7 @@ int strmcmp(const char *, const char *, int);
  char *dequote(const char *, int, unsigned int);
  int span_space(const char *, unsigned int);
  char *sanitize_path(const char *, int, unsigned int, unsigned int);
@@ -116,11 +105,9 @@ index e2212021..3768275a 100644
  char *merge_options(const char *, const char *);
  int expandamdent(const char *, char *, const struct substvar *);
  int expand_selectors(struct autofs_point *, const char *, char **, struct substvar *);
-diff --git a/lib/parse_subs.c b/lib/parse_subs.c
+--- autofs-5.1.4.orig/lib/parse_subs.c
-index de8b6773..d48fdee2 100644
++++ autofs-5.1.4/lib/parse_subs.c
---- a/lib/parse_subs.c
+@@ -878,6 +878,19 @@ char *sanitize_path(const char *path, in
-+++ b/lib/parse_subs.c
-@@ -912,6 +912,19 @@ char *sanitize_path(const char *path, int origlen, unsigned int type, unsigned i
  	return s_path;
  }
  
@@ -140,11 +127,9 @@ index de8b6773..d48fdee2 100644
  static char *hasopt(const char *str, const char *opt)
  {
  	const size_t optlen = strlen(opt);
-diff --git a/man/auto.master.5.in b/man/auto.master.5.in
+--- autofs-5.1.4.orig/man/auto.master.5.in
-index 16717015..34fff95b 100644
++++ autofs-5.1.4/man/auto.master.5.in
---- a/man/auto.master.5.in
+@@ -267,13 +267,18 @@ master map entry.
-+++ b/man/auto.master.5.in
-@@ -269,13 +269,18 @@ master map entry.
  If "\-null" is given as the map it is used to tell automount(8) to ignore a subsequent
  master map entry with the given path.
  .P