From af9dc6f39017365d21d6c31dca1261d01b42e510 Mon Sep 17 00:00:00 2001
From: Ian Kent <ikent@redhat.com>
Date: Jul 16 2012 02:40:28 +0000
Subject: - fix systemd unit (bz836524) and server check problems.


---

diff --git a/autofs-5.0.6-fix-get_nfs_info-incorrectly-fails.patch b/autofs-5.0.6-fix-get_nfs_info-incorrectly-fails.patch
new file mode 100644
index 0000000..624f73a
--- /dev/null
+++ b/autofs-5.0.6-fix-get_nfs_info-incorrectly-fails.patch
@@ -0,0 +1,35 @@
+autofs-5.0.6 - fix get_nfs_info() can incorrectly fail
+
+From: Ian Kent <ikent@redhat.com>
+
+In function get_nfs_info(), if both TCP and UDP protocols are being
+checked, the TCP check passes but the UDP check fails, the function
+will incorrectly return a fail to the caller.
+---
+
+ CHANGELOG            |    1 +
+ modules/replicated.c |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+
+--- autofs-5.0.6.orig/CHANGELOG
++++ autofs-5.0.6/CHANGELOG
+@@ -43,6 +43,7 @@
+ - fix initialization in rpc create_client().
+ - fix libtirpc name clash.
+ - fix systemd argument passing.
++- fix get_nfs_info() can incorrectly fail.
+ 
+ 28/06/2011 autofs-5.0.6
+ -----------------------
+--- autofs-5.0.6.orig/modules/replicated.c
++++ autofs-5.0.6/modules/replicated.c
+@@ -769,7 +769,7 @@ static int get_vers_and_cost(unsigned lo
+ 		supported = get_nfs_info(logopt, host,
+ 				   &pm_info, &rpc_info, "udp", vers, options);
+ 		if (IS_ERR(supported)) {
+-			if (ERR(supported) == ETIMEDOUT)
++			if (!ret && ERR(supported) == ETIMEDOUT)
+ 				return ret;
+ 		} else if (supported) {
+ 			ret = 1;
diff --git a/autofs-5.0.6-fix-systemd-argument-passing.patch b/autofs-5.0.6-fix-systemd-argument-passing.patch
new file mode 100644
index 0000000..7ee2b90
--- /dev/null
+++ b/autofs-5.0.6-fix-systemd-argument-passing.patch
@@ -0,0 +1,36 @@
+autofs-5.0.6 - fix systemd argument passing
+
+From: Ian Kent <ikent@redhat.com>
+
+The substition of the environment variable OPTIONS, from the autofs
+confuguration may contain multiple elements that need to be passed
+as such when systemd run the unit file. That requires that the braces
+be omitted the ExecStart entry of the unit file.
+---
+
+ CHANGELOG                 |    1 +
+ samples/autofs.service.in |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+
+--- autofs-5.0.6.orig/CHANGELOG
++++ autofs-5.0.6/CHANGELOG
+@@ -42,6 +42,7 @@
+ - fix configure string length tests for sss library.
+ - fix initialization in rpc create_client().
+ - fix libtirpc name clash.
++- fix systemd argument passing.
+ 
+ 28/06/2011 autofs-5.0.6
+ -----------------------
+--- autofs-5.0.6.orig/samples/autofs.service.in
++++ autofs-5.0.6/samples/autofs.service.in
+@@ -6,7 +6,7 @@ After=network.target ypbind.service
+ Type=forking
+ PIDFile=@@autofspiddir@@/autofs.pid
+ EnvironmentFile=-@@autofsconfdir@@/autofs
+-ExecStart=@@sbindir@@/automount ${OPTIONS} --pid-file @@autofspiddir@@/autofs.pid
++ExecStart=@@sbindir@@/automount $OPTIONS --pid-file @@autofspiddir@@/autofs.pid
+ ExecReload=/usr/bin/kill -HUP $MAINPID
+ 
+ [Install]
diff --git a/autofs.spec b/autofs.spec
index e211d66..c1bba16 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -8,7 +8,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.6
-Release: 20%{?dist}
+Release: 21%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -59,6 +59,8 @@ Patch43: autofs-5.0.6-fix-dlopen-error-handling-in-sss-module.patch
 Patch44: autofs-5.0.6-fix-configure-string-length-tests.patch
 Patch45: autofs-5.0.6-fix-initialization-in-rpc-create_client.patch
 Patch46: autofs-5.0.6-fix-libtirpc-name-clash.patch
+Patch47: autofs-5.0.6-fix-systemd-argument-passing.patch
+Patch48: autofs-5.0.6-fix-get_nfs_info-incorrectly-fails.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_systemd}
 BuildRequires: systemd-units
@@ -161,6 +163,8 @@ echo %{version}-%{release} > .version
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
+%patch48 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -263,6 +267,10 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
+* Mon Jul 16 2012 Ian Kent <kent@redhat.com> - 1:5.0.6-21
+- fix systemd argument passing (bz836524).
+- fix get_nfs_info() can incorrectly fail.
+
 * Thu Jun 28 2012 Ian Kent <ikent@redhat.com> - 1:5.0.6-20
 - rebuild to pickup util-linux sloppy option fix (bz836207).