mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
g13: Run mount after dmsetup.
* g13/g13-syshelp.c (main): Reject userids with a slash. * g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a mountpoint is known. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
ede0061feb
commit
f26867928c
2 changed files with 51 additions and 15 deletions
|
@ -512,15 +512,23 @@ main ( int argc, char **argv)
|
|||
ctrl.client.uid = (uid_t)myuid;
|
||||
}
|
||||
|
||||
pwd = getpwuid (ctrl.client.uid);
|
||||
if (!pwd || !*pwd->pw_name)
|
||||
{
|
||||
log_info ("WARNING: Name for UID not found: %s\n", strerror (errno));
|
||||
ctrl.fail_all_cmds = 1;
|
||||
ctrl.client.uname = xstrdup ("?");
|
||||
}
|
||||
else
|
||||
ctrl.client.uname = xstrdup (pwd->pw_name);
|
||||
pwd = getpwuid (ctrl.client.uid);
|
||||
if (!pwd || !*pwd->pw_name)
|
||||
{
|
||||
log_info ("WARNING: Name for UID not found: %s\n", strerror (errno));
|
||||
ctrl.fail_all_cmds = 1;
|
||||
ctrl.client.uname = xstrdup ("?");
|
||||
}
|
||||
else
|
||||
ctrl.client.uname = xstrdup (pwd->pw_name);
|
||||
|
||||
/* Check that the user name does not contain a directory
|
||||
separator. */
|
||||
if (strchr (ctrl.client.uname, '/'))
|
||||
{
|
||||
log_info ("WARNING: Invalid user name passed\n");
|
||||
ctrl.fail_all_cmds = 1;
|
||||
}
|
||||
}
|
||||
#else /*!HAVE_PWD_H || !HAVE_GETPWUID*/
|
||||
log_info ("WARNING: System does not support required syscalls\n");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue