Fix the sec=krb5* handling in debian/nfs-common.init to properly match all cases...
authorSteve Langasek <steve.langasek@canonical.com>
Mon, 13 Jan 2014 22:28:01 +0000 (14:28 -0800)
committerSteve Langasek <steve.langasek@canonical.com>
Mon, 13 Jan 2014 22:28:01 +0000 (14:28 -0800)
debian/changelog
debian/nfs-common.init

index be2c409..d43aa04 100644 (file)
@@ -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 ]
index 39f63f2..8137232 100644 (file)
@@ -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<&-