6543/davfs2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always canonicalize mount point

Browse Source
This commit is contained in:
wbaumann 2010-11-03 09:11:14 +00:00
parent f8e3e247ad
commit 93a8791136
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,10 @@
ChangeLog for davfs2 ChangeLog for davfs2
-------------------- --------------------


2010-11-03 Werner Baumann (werner.baumann@onlinehome.de)
* mount_davfs.c, check_mountpoint:
Always canonicalize mount point.

2010-08-07 Werner Baumann (werner.baumann@onlinehome.de) 2010-08-07 Werner Baumann (werner.baumann@onlinehome.de)
* webdav.c: * webdav.c:
Added missing '\r' in constant none_match_header Added missing '\r' in constant none_match_header

10
src/mount_davfs.c
View File

@ -758,13 +758,16 @@ check_mountpoint(dav_args *args)
{ {


struct passwd *pw; struct passwd *pw;
int relative = (*mpoint != '/');


if (*mpoint != '/') {
char *mp = canonicalize_file_name(mpoint); char *mp = canonicalize_file_name(mpoint);
if (!mp) if (!mp)
error(EXIT_FAILURE, 0, error(EXIT_FAILURE, 0,
_("can't evaluate path of mount point %s"), mpoint); _("can't evaluate path of mount point %s"), mpoint);
if (getuid() != 0) { free(mpoint);
mpoint = mp;

if (relative && getuid() != 0) {
pw = getpwuid(getuid()); pw = getpwuid(getuid());
if (!pw || !pw->pw_dir) if (!pw || !pw->pw_dir)
error(EXIT_FAILURE, 0, error(EXIT_FAILURE, 0,
@ -773,9 +776,6 @@ check_mountpoint(dav_args *args)
error(EXIT_FAILURE, 0, _("A relative mount point must lie " error(EXIT_FAILURE, 0, _("A relative mount point must lie "
"within your home directory")); "within your home directory"));
} }
free(mpoint);
mpoint = mp;
}


if (strcmp(mpoint, "/") == 0 || strlen(mpoint) < 2) if (strcmp(mpoint, "/") == 0 || strlen(mpoint) < 2)
error(EXIT_FAILURE, 0, _("invalid mount point %s"), mpoint); error(EXIT_FAILURE, 0, _("invalid mount point %s"), mpoint);