diff options
| author | Werner Koch <wk@gnupg.org> | 2008-07-17 21:49:51 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2008-07-17 21:49:51 +0200 |
| commit | a7c9e79190759d76a5396441fe6ac502d7b38835 (patch) | |
| tree | 40b23f8ca0a6e484c07ac03b2912bcdd5c256ea2 /g10 | |
| parent | Do not run the setuid test if running under as root proper. (diff) | |
| download | gnupg2-a7c9e79190759d76a5396441fe6ac502d7b38835.tar.xz gnupg2-a7c9e79190759d76a5396441fe6ac502d7b38835.zip | |
Revert that last stupid setuid detection fix.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/exec.c | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 342c012ee..4aa1ed114 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -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 diff --git a/g10/exec.c b/g10/exec.c index 40561e871..9ecd2ab64 100644 --- a/g10/exec.c +++ b/g10/exec.c @@ -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 @@ -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; |