Commit 1fc3e141 authored by Steve Langasek's avatar Steve Langasek
Browse files

Merge fix for bug #1041377.

parents 29e837ed c09d7ca3
mountall (2.47) UNRELEASED; urgency=low
* Adjust parsing of options so mountall doesn't strip options that are
substrings of these strings (showthrough, optional, bootwait, nobootwait
or timeout). This fixes the issue where timeo was getting stripped from
nfs mounts. LP: #1041377.
-- Dave Chiluk <dave.chiluk@canonical.com> Wed, 19 Dec 2012 10:58:21 -0600
mountall (2.46) unstable; urgency=low
* Fix a further remaining issue from 2.41: by fixing the missing 'mounted'
......
......@@ -684,7 +684,8 @@ cut_options (const void *parent,
va_copy (options, args);
while ((option = va_arg (options, const char *)) != NULL) {
if (j && ! strncmp (opts + i, option, j))
if (j && strlen(option) == j
&& ! strncmp (opts + i, option, j))
break;
}
va_end (options);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment