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

diff --git a/debian/changelog b/debian/changelog
index be2c40988ba644f95c7648ffdeb5fdac3c596fe0..d43aa043919da5e8e77385a41ca460e08c5c2724 100644 (file)
--- 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 ]
 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 39f63f2c16ec60c009ac2237d32cf45c09dbc6fd..8137232fd34e92a176b8b81a92a5bcecff2c69f4 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -47,12 +47,16 @@ if [ -f /etc/fstab ]; then
                continue
                ;;
        esac
                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<&-
     done
 
     exec 0<&9 9<&-