[svn] GnuPG - r4799 - in branches/STABLE-BRANCH-1-4: cipher doc g10

[svn author wk]

Author: wk
Date: 2008-07-17 21:47:19 +0200 (Thu, 17 Jul 2008)
New Revision: 4799

Modified:
   branches/STABLE-BRANCH-1-4/cipher/idea-stub.c
   branches/STABLE-BRANCH-1-4/cipher/rndunix.c
   branches/STABLE-BRANCH-1-4/doc/gpgv.texi
   branches/STABLE-BRANCH-1-4/g10/exec.c
   branches/STABLE-BRANCH-1-4/g10/gpg.c
Log:
Revert that last stupid setuid detection fix.


Modified: branches/STABLE-BRANCH-1-4/cipher/idea-stub.c
===================================================================
--- branches/STABLE-BRANCH-1-4/cipher/idea-stub.c	2008-07-17 19:40:53 UTC (rev 4798)
+++ branches/STABLE-BRANCH-1-4/cipher/idea-stub.c	2008-07-17 19:47:19 UTC (rev 4799)
@@ -119,7 +119,7 @@
 
 #ifndef _WIN32
   /* Make sure we are not setuid. */
-  if (getuid() != geteuid())
+  if (getuid () != geteuid ())
     log_bug("trying to load an extension while still setuid\n");
 #endif
 

Modified: branches/STABLE-BRANCH-1-4/cipher/rndunix.c
===================================================================
--- branches/STABLE-BRANCH-1-4/cipher/rndunix.c	2008-07-17 19:40:53 UTC (rev 4798)
+++ branches/STABLE-BRANCH-1-4/cipher/rndunix.c	2008-07-17 19:47:19 UTC (rev 4799)
@@ -804,7 +804,7 @@
 
     if( !gatherer_pid ) {
 	/* make sure we are not setuid */
-	if( getuid() != geteuid() )
+	if ( getuid () != geteuid () )
 	    BUG();
 	/* time to start the gatherer process */
 	if( pipe( pipedes ) ) {

Modified: branches/STABLE-BRANCH-1-4/doc/gpgv.texi
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/gpgv.texi	2008-07-17 19:40:53 UTC (rev 4798)
+++ branches/STABLE-BRANCH-1-4/doc/gpgv.texi	2008-07-17 19:47:19 UTC (rev 4799)
@@ -55,8 +55,8 @@
 @mansect description
 @code{@gpgvname} is an OpenPGP signature verification tool.
 
-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
+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
 @code{gpg} and uses a different (and simpler) way to check that
 the public keys used to make the signature are valid. There are
 no configuration files and only a few options are implemented.
@@ -114,7 +114,7 @@
 
 @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.
 
 @mansect examples
@@ -126,7 +126,7 @@
 @itemx @gpgvname @code{sigfile} 
 Verify the signature of the file. The second form
 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
 constructed by cutting off the extension (".asc", ".sig" or ".sign") from
 @code{sigfile}.
@@ -152,7 +152,7 @@
 @table @asis
 
 @item ~/.gnupg/trustedkeys.gpg
-The default keyring with the allowed keys
+The default keyring with the allowed keys.
 
 @end table
 

Modified: branches/STABLE-BRANCH-1-4/g10/exec.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/exec.c	2008-07-17 19:40:53 UTC (rev 4798)
+++ branches/STABLE-BRANCH-1-4/g10/exec.c	2008-07-17 19:47:19 UTC (rev 4799)
@@ -321,7 +321,7 @@
 #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. */
-  if(getuid()!=geteuid())
+  if ( getuid () != geteuid () )
     BUG();
 #endif
 

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2008-07-17 19:40:53 UTC (rev 4798)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2008-07-17 19:47:19 UTC (rev 4799)
@@ -2012,7 +2012,7 @@
 #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. */
-    if(getuid()!=geteuid())
+    if ( getuid () != geteuid () )
       BUG();
 #endif