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

replace xxfsent functions by xxmntent functions

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

4
ChangeLog
View File

@ -4,6 +4,10 @@ ChangeLog for davfs2
2010-11-03 Werner Baumann (werner.baumann@onlinehome.de) 2010-11-03 Werner Baumann (werner.baumann@onlinehome.de)
* mount_davfs.c, check_mountpoint: * mount_davfs.c, check_mountpoint:
Always canonicalize mount point. Always canonicalize mount point.
* mount_davfs.c, check_fstab:
Replace xxfsent functions by xxmntent functions.
Don't compare commandline and fstab for options
'user' and 'users', only check fstab for presence.


2010-08-07 Werner Baumann (werner.baumann@onlinehome.de) 2010-08-07 Werner Baumann (werner.baumann@onlinehome.de)
* webdav.c: * webdav.c:

61
src/mount_davfs.c
View File

@ -29,7 +29,6 @@
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <fstab.h>
#include <getopt.h> #include <getopt.h>
#include <grp.h> #include <grp.h>
#ifdef HAVE_LIBINTL_H #ifdef HAVE_LIBINTL_H
@ -680,64 +679,66 @@ check_fstab(const dav_args *args)
dav_args *n_args = new_args(); dav_args *n_args = new_args();
n_args->mopts = DAV_USER_MOPTS; n_args->mopts = DAV_USER_MOPTS;


setfsent(); FILE *fstab = setmntent(_PATH_MNTTAB, "r");
struct fstab *ft = getfsfile(mpoint); if (!fstab)
if (!ft) { error(EXIT_FAILURE, errno, _("can't open file %s"), _PATH_MNTTAB);

char *mp = NULL; char *mp = NULL;
if (asprintf(&mp, "%s/", mpoint) < 0) abort(); if (asprintf(&mp, "%s/", mpoint) < 0) abort();
ft = getfsfile(mp); struct mntent *ft = getmntent(fstab);
if (mp) free(mp); while (ft && ft->mnt_dir) {
if (strcmp(ft->mnt_dir, mpoint) == 0 || strcmp(ft->mnt_dir, mp) == 0)
break;
ft = getmntent(fstab);
} }
if (!ft || !ft->fs_spec) if (!ft || !ft->mnt_dir)
error(EXIT_FAILURE, 0, _("no entry for %s found in %s"), url, error(EXIT_FAILURE, 0, _("no entry for %s found in %s"), url,
_PATH_FSTAB); _PATH_MNTTAB);
if (mp) free(mp);


if (strcmp(url, ft->fs_spec) != 0) { if (strcmp(url, ft->mnt_fsname) != 0) {
char *fstab_url = decode_octal(ft->fs_spec); char *fstab_url = decode_octal(ft->mnt_fsname);
if (strcmp(url, fstab_url) != 0) if (strcmp(url, fstab_url) != 0)
error(EXIT_FAILURE, 0, _("different URL in %s"), _PATH_FSTAB); error(EXIT_FAILURE, 0, _("different URL in %s"), _PATH_MNTTAB);
free(fstab_url); free(fstab_url);
} }


if (ft->fs_mntops) if (!ft->mnt_type || strcmp(DAV_FS_TYPE, ft->mnt_type) != 0)
get_options(n_args, ft->fs_mntops);

if (! ft->fs_vfstype || strcmp(DAV_FS_TYPE, ft->fs_vfstype) != 0)
error(EXIT_FAILURE, 0, _("different file system type in %s"), error(EXIT_FAILURE, 0, _("different file system type in %s"),
_PATH_FSTAB); _PATH_MNTTAB);

if (ft->mnt_opts)
get_options(n_args, ft->mnt_opts);

endmntent(fstab);

if (args->conf || n_args->conf) { if (args->conf || n_args->conf) {
if (!args->conf || !n_args->conf if (!args->conf || !n_args->conf
|| strcmp(args->conf, n_args->conf) != 0) || strcmp(args->conf, n_args->conf) != 0)
error(EXIT_FAILURE, 0, _("different config file in %s"), error(EXIT_FAILURE, 0, _("different config file in %s"),
_PATH_FSTAB); _PATH_MNTTAB);
} }
if (args->cl_username || n_args->cl_username) { if (args->cl_username || n_args->cl_username) {
if (!args->cl_username || !n_args->cl_username if (!args->cl_username || !n_args->cl_username
|| strcmp(args->cl_username, n_args->cl_username) != 0) || strcmp(args->cl_username, n_args->cl_username) != 0)
error(EXIT_FAILURE, 0, _("different username in %s"), _PATH_FSTAB); error(EXIT_FAILURE, 0, _("different username in %s"), _PATH_MNTTAB);
} }
if (!n_args->user && !n_args->users) if (!n_args->user && !n_args->users)
error(EXIT_FAILURE, 0, error(EXIT_FAILURE, 0,
_("neither option `user' nor option `users' set in %s"), _("neither option `user' nor option `users' set in %s"),
_PATH_FSTAB); _PATH_MNTTAB);
if (args->user != n_args->user)
error(EXIT_FAILURE, 0, _("different option `user' in %s"), _PATH_FSTAB);
if (args->users != n_args->users)
error(EXIT_FAILURE, 0, _("different option `users' in %s"),
_PATH_FSTAB);
if (args->mopts != n_args->mopts) if (args->mopts != n_args->mopts)
error(EXIT_FAILURE, 0, _("different mount options in %s"), error(EXIT_FAILURE, 0, _("different mount options in %s"),
_PATH_FSTAB); _PATH_MNTTAB);
if (args->uid != n_args->uid) if (args->uid != n_args->uid)
error(EXIT_FAILURE, 0, _("different uid in %s"), _PATH_FSTAB); error(EXIT_FAILURE, 0, _("different uid in %s"), _PATH_MNTTAB);
if (args->gid != n_args->gid) if (args->gid != n_args->gid)
error(EXIT_FAILURE, 0, _("different gid in %s"), _PATH_FSTAB); error(EXIT_FAILURE, 0, _("different gid in %s"), _PATH_MNTTAB);
if (args->dir_mode != n_args->dir_mode) if (args->dir_mode != n_args->dir_mode)
error(EXIT_FAILURE, 0, _("different dir_mode in %s"), _PATH_FSTAB); error(EXIT_FAILURE, 0, _("different dir_mode in %s"), _PATH_MNTTAB);
if (args->file_mode != n_args->file_mode) if (args->file_mode != n_args->file_mode)
error(EXIT_FAILURE, 0, _("different file_mode in %s"), _PATH_FSTAB); error(EXIT_FAILURE, 0, _("different file_mode in %s"), _PATH_MNTTAB);


endfsent();
delete_args(n_args); delete_args(n_args);
} }