oping: Drop root privileges as soon as possible.

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 48f6db5..3201e85 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; only version 2 of the License is
+ * applicable.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -70,9 +70,10 @@ typedef struct ping_context
        double latency_total_square;
 } ping_context_t;
 
-static double opt_interval   = 1.0;
-static int    opt_addrfamily = PING_DEF_AF;
-static int    opt_count      = -1;
+static double  opt_interval   = 1.0;
+static int     opt_addrfamily = PING_DEF_AF;
+static char   *opt_srcaddr    = NULL;
+static int     opt_count      = -1;
 
 void sigint_handler (int signal)
 {
@@ -115,7 +116,7 @@ int read_options (int argc, char **argv)
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:");
+               optchar = getopt (argc, argv, "46c:hi:I:");
 
                if (optchar == -1)
                        break;
@@ -144,6 +145,13 @@ int read_options (int argc, char **argv)
                                                opt_interval = new_interval;
                                }
                                break;
+                       case 'I':
+                               {
+                                       if (opt_srcaddr != NULL)
+                                               free (opt_srcaddr);
+                                       opt_srcaddr = strdup (optarg);
+                               }
+                               break;
 
                        case 'h':
                        default:
@@ -294,6 +302,15 @@ int main (int argc, char **argv)
        if (opt_addrfamily != PING_DEF_AF)
                ping_setopt (ping, PING_OPT_AF, (void *) &opt_addrfamily);
 
+       if (opt_srcaddr != NULL)
+       {
+               if (ping_setopt (ping, PING_OPT_SOURCE, (void *) opt_srcaddr) != 0)
+               {
+                       fprintf (stderr, "Setting source address failed: %s\n",
+                                       ping_get_error (ping));
+               }
+       }
+
        for (i = optind; i < argc; i++)
        {
                if (ping_host_add (ping, argv[i]) < 0)
@@ -305,6 +322,9 @@ int main (int argc, char **argv)
                }
        }
 
+       /* Drop root privileges if we're setuid-root. */
+       setuid (getuid ());
+
        i = 0;
        for (iter = ping_iterator_get (ping);
                        iter != NULL;
@@ -355,7 +375,8 @@ int main (int argc, char **argv)
 
                if (ping_send (ping) < 0)
                {
-                       fprintf (stderr, "ping_send failed\n");
+                       fprintf (stderr, "ping_send failed: %s\n",
+                                       ping_get_error (ping));
                        return (1);
                }