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

Canonicalize conf in parse_cmdline

Browse Source
This commit is contained in:
wbaumann 2012-01-22 16:37:39 +00:00
parent da76a8448a
commit 0fc24da75a
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@ ChangeLog for davfs2
2012-01-22 Werner Baumann (werner.baumann@onlinehome.de) 2012-01-22 Werner Baumann (werner.baumann@onlinehome.de)
* mount_davfs.c: * mount_davfs.c:
Add function expand_home. Add function expand_home.
* mount_davs.c, parse_cmdline, parse_config:
Canonicalize conf in parse_cmdline.


2012-01-21 Werner Baumann (werner.baumann@onlinehome.de) 2012-01-21 Werner Baumann (werner.baumann@onlinehome.de)
* mount_davfs.c, check_fstab, get_options, parse_persona: * mount_davfs.c, check_fstab, get_options, parse_persona:

40
src/mount_davfs.c
View File

@ -914,7 +914,7 @@ is_mounted(void)
it prints an error message and calls exit(EXIT_FAILURE). it prints an error message and calls exit(EXIT_FAILURE).
argc : the number of arguments. argc : the number of arguments.
argv[] : array of argument strings. argv[] : array of argument strings.
Requires: uid, gid, mopts Requires: uid, uid_name, gid, home, mopts
Provides: cmdline. relative_mpoint, conf, user, users, netdev, mopts, Provides: cmdline. relative_mpoint, conf, user, users, netdev, mopts,
add_mopts, fsuid, fsgid, dir_mode, file_mode, scheme, host, port, add_mopts, fsuid, fsgid, dir_mode, file_mode, scheme, host, port,
path, cl_username. */ path, cl_username. */
@ -1008,6 +1008,13 @@ parse_commandline(dav_args *args, int argc, char *argv[])
if (!args->port) if (!args->port)
args->port = ne_uri_defaultport(args->scheme); args->port = ne_uri_defaultport(args->scheme);


if (args->conf) {
expand_home(&args->conf, args);
} else if (!args->privileged) {
if (asprintf(&args->conf, "%s/.%s/%s", args->home, PACKAGE,
DAV_CONFIG) < 0) abort();
}

return args; return args;
} }


@ -1031,33 +1038,16 @@ parse_config(dav_args *args)
{ {
read_config(args, DAV_SYS_CONF_DIR "/" DAV_CONFIG, 1); read_config(args, DAV_SYS_CONF_DIR "/" DAV_CONFIG, 1);


if (!args->privileged && !args->conf) if (args->conf)
args->conf = ne_concat(args->home, "/.", PACKAGE, "/", DAV_CONFIG,
NULL);

struct passwd *pw = getpwuid(getuid());
if (!pw || !pw->pw_dir)
error(EXIT_FAILURE, 0, _("can't determine home directory"));

if (args->conf) {
if (*args->conf == '~') {
int p = 1;
if (*(args->conf + p) == '/')
p++;
char *f = ne_concat(pw->pw_dir, "/", args->conf + p, NULL);
free(args->conf);
args->conf = f;
}
read_config(args, args->conf, 0); read_config(args, args->conf, 0);
}


if (!args->dav_user) if (!args->dav_user)
args->dav_user = ne_strdup(DAV_USER); args->dav_user = ne_strdup(DAV_USER);
struct passwd *d_pw = getpwnam(args->dav_user); struct passwd *pw = getpwnam(args->dav_user);
if (!d_pw) if (!pw)
error(EXIT_FAILURE, errno, _("user %s does not exist"), error(EXIT_FAILURE, errno, _("user %s does not exist"),
args->dav_user); args->dav_user);
args->dav_uid = d_pw->pw_uid; args->dav_uid = pw->pw_uid;


if (!args->dav_group) if (!args->dav_group)
args->dav_group = ne_strdup(DAV_GROUP); args->dav_group = ne_strdup(DAV_GROUP);
@ -1069,6 +1059,10 @@ parse_config(dav_args *args)


eval_modes(args); eval_modes(args);


pw = getpwuid(getuid());
if (!pw || !pw->pw_dir)
error(EXIT_FAILURE, 0, _("can't determine home directory"));

if (args->servercert && *args->servercert == '~') { if (args->servercert && *args->servercert == '~') {
int p = 1; int p = 1;
if (*(args->servercert + p) == '/') if (*(args->servercert + p) == '/')
@ -1590,7 +1584,7 @@ eval_modes(dav_args *args)
absolute filename (starting with '/') in the users home directory. absolute filename (starting with '/') in the users home directory.
user must be the name of the mounting user. user must be the name of the mounting user.
Otherwise dir is unchanged. Otherwise dir is unchanged.
Requires: username, home. */ Requires: uid_name, home. */
static void static void
expand_home(char **dir, const dav_args *args) expand_home(char **dir, const dav_args *args)
{ {