1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-01 22:28:02 +02:00

Revert that last stupid setuid detection fix.

This commit is contained in:
Werner Koch 2008-07-17 19:47:19 +00:00
parent 96e1c57472
commit d9527051eb
5 changed files with 9 additions and 9 deletions

View File

@ -119,7 +119,7 @@ load_module (const char *name)
#ifndef _WIN32 #ifndef _WIN32
/* Make sure we are not setuid. */ /* Make sure we are not setuid. */
if (getuid() != geteuid()) if (getuid () != geteuid ())
log_bug("trying to load an extension while still setuid\n"); log_bug("trying to load an extension while still setuid\n");
#endif #endif

View File

@ -804,7 +804,7 @@ rndunix_gather_random( void (*add)(const void*, size_t, int), int requester,
if( !gatherer_pid ) { if( !gatherer_pid ) {
/* make sure we are not setuid */ /* make sure we are not setuid */
if( getuid() != geteuid() ) if ( getuid () != geteuid () )
BUG(); BUG();
/* time to start the gatherer process */ /* time to start the gatherer process */
if( pipe( pipedes ) ) { if( pipe( pipedes ) ) {

View File

@ -55,8 +55,8 @@ gpgv2
@mansect description @mansect description
@code{@gpgvname} is an OpenPGP signature verification tool. @code{@gpgvname} is an OpenPGP signature verification tool.
This program is actually a stripped down version of @code{gpg} which is This program is actually a stripped-down version of @code{gpg} which is
only able to check signatures. It is somewhat smaller than the fully blown only able to check signatures. It is somewhat smaller than the fully-blown
@code{gpg} and uses a different (and simpler) way to check that @code{gpg} and uses a different (and simpler) way to check that
the public keys used to make the signature are valid. There are the public keys used to make the signature are valid. There are
no configuration files and only a few options are implemented. no configuration files and only a few options are implemented.
@ -114,7 +114,7 @@ checks into warnings.
@mansect return value @mansect return value
The program returns 0 if everything was fine, 1 if at least The program returns 0 if everything is fine, 1 if at least
one signature was bad, and other error codes for fatal errors. one signature was bad, and other error codes for fatal errors.
@mansect examples @mansect examples
@ -126,7 +126,7 @@ one signature was bad, and other error codes for fatal errors.
@itemx @gpgvname @code{sigfile} @itemx @gpgvname @code{sigfile}
Verify the signature of the file. The second form Verify the signature of the file. The second form
is used for detached signatures, where @code{sigfile} is the detached is used for detached signatures, where @code{sigfile} is the detached
signature (either ASCII armored or binary) and are the signed signature (either ASCII-armored or binary) and are the signed
data; if this is not given the name of the file holding the signed data is data; if this is not given the name of the file holding the signed data is
constructed by cutting off the extension (".asc", ".sig" or ".sign") from constructed by cutting off the extension (".asc", ".sig" or ".sign") from
@code{sigfile}. @code{sigfile}.
@ -152,7 +152,7 @@ If set directory used instead of "~/.gnupg".
@table @asis @table @asis
@item ~/.gnupg/trustedkeys.gpg @item ~/.gnupg/trustedkeys.gpg
The default keyring with the allowed keys The default keyring with the allowed keys.
@end table @end table

View File

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

View File

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