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

Use stored persona

Browse Source
This commit is contained in:
wbaumann 2012-01-28 16:58:55 +00:00
parent 0d03618d7e
commit 828ded4558
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mount_davfs.c
View File

@ -327,9 +327,8 @@ main(int argc, char *argv[])


if (args->debug & DAV_DBG_CONFIG) if (args->debug & DAV_DBG_CONFIG)
syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Releasing root privileges"); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Releasing root privileges");
uid_t daemon_id = geteuid();
gain_privileges(args); gain_privileges(args);
ret = setuid(daemon_id); ret = setuid(args->uid);
if (ret) { if (ret) {
syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR), syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR),
_("can't release root privileges")); _("can't release root privileges"));
@ -1302,14 +1301,8 @@ write_mtab_entry(const dav_args *args)
mntent. mnt_passno = 0; mntent. mnt_passno = 0;


if (!args->privileged) { if (!args->privileged) {
struct passwd *pw = getpwuid(getuid());
if (!pw) {
error(0, errno, _("Warning: can't read user data base. Mounting "
"anyway, but there is no entry in mtab."));
return;
}
char *opts = mntent.mnt_opts; char *opts = mntent.mnt_opts;
mntent.mnt_opts = ne_concat(opts, ",user=", pw->pw_name, NULL); mntent.mnt_opts = ne_concat(opts, ",user=", args->uid_name, NULL);
free(opts); free(opts);
} }