summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-06-04 15:21:05 +0200
committerKay Sievers <kay@vrfy.org>2012-06-04 15:21:05 +0200
commitec6ceb18663940efb1963704923430be0e83f1f7 (patch)
tree095d7e20b072ee1609b688d0a2953e7829ab20c6
parent4b7126538c25268c79ff10d166920934f149a329 (diff)
fstab-generator: avoid mangling of mount source string
This is a valid source entry in /etc/fstab: //192.168.6.10/data /data cifs noperm,auto On Mon, Jun 4, 2012 at 2:04 PM, Dave Reisner <d@falconindy.com> wrote: > On Mon, Jun 04, 2012 at 12:57:47PM +0200, Kay Sievers wrote: >> >> Changed it to use: >> path_is_absolute() >> instead of: >> is_path(), >> so that we still sanitize the input we might match against. >> >> Let me know, if you think that could still cause any problems? > Yes, this will still break CIFS shares.
-rw-r--r--src/fstab-generator/fstab-generator.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 0746724983..d9ba3e32e2 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -470,10 +470,7 @@ static int parse_fstab(void) {
goto finish;
}
- if (path_is_absolute(what))
- path_kill_slashes(what);
-
- if (path_is_absolute(where))
+ if (is_path(where))
path_kill_slashes(where);
log_debug("Found entry what=%s where=%s type=%s", what, where, me->mnt_type);