From: chip <chip>
Date: Thu, 24 Jul 2003 19:19:40 +0000 (+0000)
Subject: Reformat temporary addition of 127.0.0.1 to auth channel.
X-Git-Tag: nfs-utils-1-0-5-post1~7
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=19be35f590460dc2771d151b7e0991090ef92308;hp=bce6f6871f481087890674497b4b2154dc4825fc

Reformat temporary addition of 127.0.0.1 to auth channel.
---

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 43fb381..0894f20 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -43,24 +43,23 @@ case "$1" in
 		printf " nfsd"
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
+
 		printf " mountd"
+
 		# make sure 127.0.0.1 is a valid source for requests
 		ClearAddr=
-		if [ -f /proc/net/rpc/auth.unix.ip/channel ] ; then
-		  if   grep -s 127.0.0.1 /proc/net/rpc/auth.unix.ip/content > /dev/null ; then
-		      : address already known
-		  else
-                      echo nfsd 127.0.0.1 2147483647 localhost > /proc/net/rpc/auth.unix.ip/channel
-		      ClearAddr=yes
-		  fi
+		if [ -f /proc/net/rpc/auth.unix.ip/channel ]
+		then
+		    fgrep -qs 127.0.0.1 /proc/net/rpc/auth.unix.ip/content || {
+			echo "nfsd 127.0.0.1 2147483647 localhost" >/proc/net/rpc/auth.unix.ip/channel
+			ClearAddr=yes
+		    }
 		fi
 
 		$PREFIX/bin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
 		    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
 
-		if [ -n "$ClearAddr" ]; then
-                        echo nfsd 127.0.0.1 1  > /proc/net/rpc/auth.unix.ip/channel
-		fi
+		[ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
 
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS