Revert that last stupid setuid detection fix.

This commit is contained in:
Werner Koch 2008-07-17 19:49:51 +00:00
parent 9d5a10a453
commit a7c9e79190
5 changed files with 5 additions and 15 deletions

View File

@ -1,8 +1,3 @@
2008-07-17 Werner Koch <wk@g10code.com>
* exechelp.c (gnupg_spawn_process_detached): Do not run the setuid
test for root.
2008-06-26 Werner Koch <wk@g10code.com>
* estream.c (es_write_sanitized): Loose check for control

View File

@ -826,7 +826,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
pid_t pid;
int i;
if (getuid() && getuid() != geteuid())
if (getuid() != geteuid())
return gpg_error (GPG_ERR_BUG);
if (access (pgmname, X_OK))

View File

@ -1,8 +1,3 @@
2008-07-17 Werner Koch <wk@g10code.com>
* gpg.c (main): Do not run the setuid test for root.
* exec.c (exec_write): Ditto.
2008-06-25 Marcus Brinkmann <marcus@g10code.de>
* gpg.c (enum cmd_and_opt_values): Remove option

View File

@ -318,8 +318,8 @@ int exec_write(struct exec_info **info,const char *program,
#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
/* There should be no way to get to this spot while still carrying
setuid privs. Just in case, bomb out if we are (and are not root). */
if (getuid () && getuid () != geteuid ())
setuid privs. Just in case, bomb out if we are. */
if ( getuid () != geteuid ())
BUG ();
#endif

View File

@ -2015,8 +2015,8 @@ main (int argc, char **argv)
got_secmem = 1;
#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
/* There should be no way to get to this spot while still carrying
setuid privs. Just in case, bomb out if we are (and are not root). */
if (getuid () && getuid () != geteuid ())
setuid privs. Just in case, bomb out if we are. */
if ( getuid () != geteuid () )
BUG ();
#endif
maybe_setuid = 0;