From 95ef45bdcd165b714a2e2c2365d9b3def1421586 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Mon, 19 Jan 2015 17:12:05 -0500
Subject: [PATCH] Set the GSS_USE_PROXY variable in nfs-utils_env.sh (bz
 1176641)

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 nfs-utils.spec   |  5 ++++-
 nfs-utils_env.sh | 29 ++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index cc9a10e..4825ae6 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.3.1
-Release: 5.0%{?dist}
+Release: 6.0%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -300,6 +300,9 @@ fi
 /sbin/umount.nfs4
 
 %changelog
+* Mon Jan 19 2015 Steve Dickson <steved@redhat.com> 1.3.1-6.0
+- Set the GSS_USE_PROXY variable in nfs-utils_env.sh (bz 1176641)
+
 * Thu Jan 15 2015 Steve Dickson <steved@redhat.com> 1.3.1-5.0
 - Updated to latest upstream RC release: nfs-utils-1-3-2-rc5 (bz 1181708)
 
diff --git a/nfs-utils_env.sh b/nfs-utils_env.sh
index 476c89f..a08d69d 100644
--- a/nfs-utils_env.sh
+++ b/nfs-utils_env.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-# extract configuration from /etc/sysconfig/nfs-utils and write
-# environment to /run/sysconfig/nfs-utils to be used by systemd unit
-# files.
+#
+# Extract configuration from /etc/sysconfig/nfs and write
+# environment variables to /run/sysconfig/nfs-utils to be 
+# used by systemd nfs-config service
+#
 
 nfs_config=/etc/sysconfig/nfs
 if test -r $nfs_config; then
@@ -33,19 +35,20 @@ else
 fi
 
 if [ -n "$RPCNFSDARGS" ]; then
-    nfsdargs="$RPCNFSDARGS $grace $lease $nfsds "
+    nfsdargs="$RPCNFSDARGS $grace $lease $nfsds"
 else
-    nfsdargs="$grace $lease $nfsds "
+    nfsdargs="$grace $lease $nfsds"
 fi
 
 mkdir -p /run/sysconfig
 {
-echo RPCNFSDARGS="$nfsdargs"
-echo RPCMOUNTDARGS="$RPCMOUNTDOPTS"
-echo STATDARGS="$STATDARG"
-echo SMNOTIFYARGS="$SMNOTIFYARGS"
-echo RPCIDMAPDARGS="$RPCIDMAPDARGS"
-echo RPCGSSDARGS="$RPCGSSDARGS"
-echo RPCSVCGSSDARGS="$RPCSVCGSSDARGS"
-echo BLKMAPDARGS="$BLKMAPDARGS"
+echo RPCNFSDARGS=\"$nfsdargs\"
+echo RPCMOUNTDARGS=\"$RPCMOUNTDOPTS\"
+echo STATDARGS=\"$STATDARG\"
+echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
+echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
+echo RPCGSSDARGS=\"$RPCGSSDARGS\"
+echo RPCSVCGSSDARGS=\"$RPCSVCGSSDARGS\"
+echo BLKMAPDARGS=\"$BLKMAPDARGS\"
+echo GSS_USE_PROXY=\"$GSS_USE_PROXY\"
 } > /run/sysconfig/nfs-utils