[GNUnet-SVN] r36098 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2015-07-18 15:39:41 +0200 (Sat, 18 Jul 2015)
New Revision: 36098

Modified:
   gnunet/src/transport/gnunet-helper-transport-bluetooth.c
   gnunet/src/transport/gnunet-helper-transport-wlan.c
   gnunet/src/transport/plugin_transport_http_server.c
Log:
minor modifications to reduce warnings

Modified: gnunet/src/transport/gnunet-helper-transport-bluetooth.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-bluetooth.c    2015-07-18 
13:33:10 UTC (rev 36097)
+++ gnunet/src/transport/gnunet-helper-transport-bluetooth.c    2015-07-18 
13:39:41 UTC (rev 36098)
@@ -1667,24 +1667,30 @@
     int stdin_open;
     struct MessageStreamTokenizer *stdin_mst;
     int raw_eno, i;
-    uid_t uid;
     int crt_rfds = 0, rfds_list[MAX_PORTS];
     int broadcast, sendsocket;
+
     /* Assert privs so we can modify the firewall rules! */
-    uid = getuid ();
-  #ifdef HAVE_SETRESUID
-    if (0 != setresuid (uid, 0, 0))
     {
-      fprintf (stderr, "Failed to setresuid to root: %s\n", strerror (errno));
-      return 254;
+#ifdef HAVE_SETRESUID
+      uid_t uid = getuid ();
+
+      if (0 != setresuid (uid, 0, 0))
+      {
+       fprintf (stderr, 
+                "Failed to setresuid to root: %s\n",
+                strerror (errno));
+       return 254;
+      }
+#else
+      if (0 != seteuid (0))
+      {
+       fprintf (stderr, 
+                "Failed to seteuid back to root: %s\n", strerror (errno));
+       return 254;
+      }
+#endif
     }
-  #else
-    if (0 != seteuid (0))
-    {
-      fprintf (stderr, "Failed to seteuid back to root: %s\n", strerror 
(errno));
-      return 254;
-    }
-  #endif
 
     /* Make use of SGID capabilities on POSIX */
     memset (&dev, 0, sizeof (dev));

Modified: gnunet/src/transport/gnunet-helper-transport-wlan.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-wlan.c 2015-07-18 13:33:10 UTC 
(rev 36097)
+++ gnunet/src/transport/gnunet-helper-transport-wlan.c 2015-07-18 13:39:41 UTC 
(rev 36098)
@@ -1923,23 +1923,28 @@
   int stdin_open;
   struct MessageStreamTokenizer *stdin_mst;
   int raw_eno;
-  uid_t uid;
 
   /* assert privs so we can modify the firewall rules! */
-  uid = getuid ();
+  {
 #ifdef HAVE_SETRESUID
-  if (0 != setresuid (uid, 0, 0))
-  {
-    fprintf (stderr, "Failed to setresuid to root: %s\n", strerror (errno));
-    return 254;
-  }
+    uid_t uid = getuid ();
+
+    if (0 != setresuid (uid, 0, 0))
+    {
+      fprintf (stderr,
+              "Failed to setresuid to root: %s\n", 
+              strerror (errno));
+      return 254;
+    }
 #else
-  if (0 != seteuid (0))
-  {
-    fprintf (stderr, "Failed to seteuid back to root: %s\n", strerror (errno));
-    return 254;
+    if (0 != seteuid (0))
+    {
+      fprintf (stderr, 
+              "Failed to seteuid back to root: %s\n", strerror (errno));
+      return 254;
+    }
+#endif
   }
-#endif
 
   /* make use of SGID capabilities on POSIX */
   memset (&dev, 0, sizeof (dev));

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2015-07-18 13:33:10 UTC 
(rev 36097)
+++ gnunet/src/transport/plugin_transport_http_server.c 2015-07-18 13:39:41 UTC 
(rev 36098)
@@ -1381,6 +1381,7 @@
        method,
        url);
   stc.tag = 0;
+  options = 0; /* make gcc happy */
   if (GNUNET_SYSERR ==
       server_parse_url (plugin, url, &target, &stc.tag, &options))
   {