From: Steve Langasek <steve.langasek@canonical.com>
Date: Mon, 13 Jan 2014 22:28:01 +0000 (-0800)
Subject: Fix the sec=krb5* handling in debian/nfs-common.init to properly match all cases... 
X-Git-Tag: debian/1%1.2.8-6~8
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=33ba1ee9079650d5e4f160bbb2f1caaf44e07467;p=nfs-utils.git

Fix the sec=krb5* handling in debian/nfs-common.init to properly match all cases.  Closes: #715478.
---

diff --git a/debian/changelog b/debian/changelog
index be2c409..d43aa04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.2.8-6) UNRELEASED; urgency=medium
+
+  * Fix the sec=krb5* handling in debian/nfs-common.init to properly match
+    all cases.  Closes: #715478.
+
+ -- Steve Langasek <vorlon@debian.org>  Mon, 13 Jan 2014 22:19:43 +0000
+
 nfs-utils (1:1.2.8-5) unstable; urgency=medium
 
   [ Ben Hutchings ]
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 39f63f2..8137232 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -47,12 +47,16 @@ if [ -f /etc/fstab ]; then
 		continue
 		;;
 	esac
-        case "$OPTS" in
-
-            sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
-    	    AUTO_NEED_GSSD=yes
-            ;;
-        esac
+	OLDIFS="$IFS"
+	IFS=","
+	for OPT in $OPTS; do
+	    case "$OPT" in
+		sec=krb5|sec=krb5i|sec=krb5p)
+		    AUTO_NEED_GSSD=yes
+		;;
+	    esac
+	done
+	IFS="$OLDIFS"
     done
 
     exec 0<&9 9<&-