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

Set default user config file in parse_config

Browse Source
This commit is contained in:
wbaumann 2012-01-14 19:05:53 +00:00
parent b61ba3ab4f
commit 02d7da7cb7
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -6,10 +6,12 @@ ChangeLog for davfs2
Typo in $(top_builddir) Typo in $(top_builddir)
Added ../gl/libgnu.a to _LDADD (bug #31537, Added ../gl/libgnu.a to _LDADD (bug #31537,
thanks Tomi). thanks Tomi).
mount_davfs.h, mount_davfs.c, cache.c, kernel_interface.c: * mount_davfs.h, mount_davfs.c, cache.c, kernel_interface.c:
Rename members uid and gid of args into fsuid and fsgid. Rename members uid and gid of args into fsuid and fsgid.
mount_davfs.h, mount_davfs.c: * mount_davfs.h, mount_davfs.c:
Store process persona in args. Store process persona in args.
* mount_davfs.c, parse_config, new_args:
Set default user config file in parse_config.


2012-01-12 Werner Baumann (werner.baumann@onlinehome.de) 2012-01-12 Werner Baumann (werner.baumann@onlinehome.de)
* dav_coda.c, dav_fuse.c: * dav_coda.c, dav_fuse.c:

22
src/mount_davfs.c
View File

@ -153,7 +153,7 @@ static dav_args *
parse_commandline(dav_args *args, int argc, char *argv[]); parse_commandline(dav_args *args, int argc, char *argv[]);


static void static void
parse_config(int argc, char *argv[], dav_args *args); parse_config(dav_args *args);


static void static void
parse_secrets(dav_args *args); parse_secrets(dav_args *args);
@ -194,7 +194,7 @@ static dav_args *
new_args(void); new_args(void);


static void static void
log_dbg_config(char *argv[], dav_args *args); log_dbg_config(dav_args *args);


static int static int
parse_line(char *line, int parmc, char *parmv[]); parse_line(char *line, int parmc, char *parmv[]);
@ -248,7 +248,7 @@ main(int argc, char *argv[])
if (getuid() != 0) if (getuid() != 0)
check_fstab(args); check_fstab(args);


parse_config(argc, argv, args); parse_config(args);


check_mountpoint(args); check_mountpoint(args);


@ -1034,10 +1034,14 @@ parse_commandline(dav_args *args, int argc, char *argv[])
given it will be parsed too and overwrites the values from the system given it will be parsed too and overwrites the values from the system
wide configuration file. */ wide configuration file. */
static void static void
parse_config(int argc, char *argv[], dav_args *args) 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)
args->conf = ne_concat(args->home, "/.", PACKAGE, "/", DAV_CONFIG,
NULL);

struct passwd *pw = getpwuid(getuid()); struct passwd *pw = getpwuid(getuid());
if (!pw || !pw->pw_dir) if (!pw || !pw->pw_dir)
error(EXIT_FAILURE, 0, _("can't determine home directory")); error(EXIT_FAILURE, 0, _("can't determine home directory"));
@ -1153,7 +1157,7 @@ parse_config(int argc, char *argv[], dav_args *args)
} }


if (args->debug & DAV_DBG_CONFIG) if (args->debug & DAV_DBG_CONFIG)
log_dbg_config(argv, args); log_dbg_config(args);
} }




@ -1742,12 +1746,6 @@ new_args(void)
args->dav_user = ne_strdup(DAV_USER); args->dav_user = ne_strdup(DAV_USER);
args->dav_group = ne_strdup(DAV_GROUP); args->dav_group = ne_strdup(DAV_GROUP);


if (getuid() != 0) {
args->conf = ne_concat(user_dir, "/", DAV_CONFIG, NULL);
} else {
args->conf = NULL;
}

args->user = 0; args->user = 0;
args->users = 0; args->users = 0;
args->netdev = 1; args->netdev = 1;
@ -1830,7 +1828,7 @@ new_args(void)




static void static void
log_dbg_config(char *argv[], dav_args *args) log_dbg_config(dav_args *args)
{ {
syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
"%s", args->cmdline); "%s", args->cmdline);