[nfs-utils/f21] Handle the rpcuser like other created users (bz 1165322)

[Steve Dickson]

commit 74fcb4efa1c44ab51c0031e6299e873b1e80f0a9
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Dec 13 14:56:42 2014 -0500

    Handle the rpcuser like other created users (bz 1165322)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-utils.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/nfs-utils.spec b/nfs-utils.spec
index a455023..c0ad7ed 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -172,9 +172,15 @@ for x in gssd svcgssd idmapd ; do
     fi
 done
 
-/usr/sbin/useradd -l -c "RPC Service User" -r \
-		-s /sbin/nologin -u 29 -d /var/lib/nfs rpcuser 2>/dev/null || :
-/usr/sbin/groupadd -g 29 rpcuser 2>/dev/null || :
+%define rpcuser_uid 29
+# Create rpcuser uid as long as it does not already exist.
+cat /etc/passwd | cut -d':' -f 1 | grep --quiet rpcuser 2>/dev/null
+if [ "$?" -eq 1 ]; then
+    /usr/sbin/useradd -l -c "RPC Service User" -r -g %{rpcuser_uid} \
+        -s /sbin/nologin -u %{rpcuser_uid} -d /var/lib/nfs rpcuser 2>/dev/null || :
+else
+ /usr/sbin/usermod -u %{rpcuser_uid} -g %{rpcuser_uid} rpcuser 2>/dev/null || :
+fi 
 
 # Using the 16-bit value of -2 for the nfsnobody uid and gid
 %define nfsnobody_uid	65534
@@ -285,6 +291,7 @@ fi
 %changelog
 * Sat Dec 13 2014 Steve Dickson <steved at redhat.com> 1.3.1-4.0
 - Updated to latest upstream RC release: nfs-utils-1-3-2-rc4
+- Handle the rpcuser like other created users (bz 1165322)
 
 * Wed Dec 3 2014 Steve Dickson <steved at redhat.com> 1.3.1-2.3
 - Fixed typos in nfs-utils sysconfig files (bz 1170354)