[svn] GnuPG - r4800 - in trunk: common g10

[svn author wk]

Author: wk
Date: 2008-07-17 21:49:51 +0200 (Thu, 17 Jul 2008)
New Revision: 4800

Modified:
   trunk/common/ChangeLog
   trunk/common/exechelp.c
   trunk/g10/ChangeLog
   trunk/g10/exec.c
   trunk/g10/gpg.c
Log:
Revert that last stupid setuid detection fix. 


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2008-07-17 19:47:19 UTC (rev 4799)
+++ trunk/common/ChangeLog	2008-07-17 19:49:51 UTC (rev 4800)
@@ -1,8 +1,3 @@
-2008-07-17  Werner Koch  <wk at g10code.com>
-
-	* exechelp.c (gnupg_spawn_process_detached): Do not run the setuid
-	test for root.
-
 2008-06-26  Werner Koch  <wk at g10code.com>
 
 	* estream.c (es_write_sanitized): Loose check for control

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2008-07-17 19:47:19 UTC (rev 4799)
+++ trunk/g10/ChangeLog	2008-07-17 19:49:51 UTC (rev 4800)
@@ -1,8 +1,3 @@
-2008-07-17  Werner Koch  <wk at g10code.com>
-
-	* gpg.c (main): Do not run the setuid test for root.
-	* exec.c (exec_write): Ditto.
-
 2008-06-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpg.c (enum cmd_and_opt_values): Remove option

Modified: trunk/common/exechelp.c
===================================================================
--- trunk/common/exechelp.c	2008-07-17 19:47:19 UTC (rev 4799)
+++ trunk/common/exechelp.c	2008-07-17 19:49:51 UTC (rev 4800)
@@ -826,7 +826,7 @@
   pid_t pid;
   int i;
 
-  if (getuid() && getuid() != geteuid())
+  if (getuid() != geteuid())
     return gpg_error (GPG_ERR_BUG);
 
   if (access (pgmname, X_OK))

Modified: trunk/g10/exec.c
===================================================================
--- trunk/g10/exec.c	2008-07-17 19:47:19 UTC (rev 4799)
+++ trunk/g10/exec.c	2008-07-17 19:49:51 UTC (rev 4800)
@@ -318,8 +318,8 @@
 
 #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
 

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2008-07-17 19:47:19 UTC (rev 4799)
+++ trunk/g10/gpg.c	2008-07-17 19:49:51 UTC (rev 4800)
@@ -2015,8 +2015,8 @@
       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;