[SCM] GNU Inetutils branch, master, updated. release_1_5-195-gd4157ab

[Rakesh Pandit]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d4157abcfb08634a968c98a874c9d895f7cf2681

The branch, master has been updated
       via  d4157abcfb08634a968c98a874c9d895f7cf2681 (commit)
      from  313473ae640421228e16117be2f228239ec071cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d4157abcfb08634a968c98a874c9d895f7cf2681
Author: Rakesh Pandit <address@hidden>
Date:   Tue Oct 20 23:10:26 2009 +0530

    Removed mutual exclusion for `--ignore-routing' and '--debug' options
    and fixed `--ignore-routing' option in parse_opt for ping6.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    7 +++++++
 ping/ping.c  |    4 ++--
 ping/ping6.c |    4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fbbee7..f89de16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-20  Rakesh Pandit  <address@hidden>
+
+       * ping/ping.c (parse_opt): Handle `--debug' and `--ignore-routing'
+       simultaneously.
+       * ping/ping6.c (parse_opt): Likewise.  Set `socket_type' to
+       SO_DONTROUTE.
+
 2009-10-10  Giuseppe Scrivano <address@hidden>
 
        * TODO: Updated.
diff --git a/ping/ping.c b/ping/ping.c
index e3be687..b194c38 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -144,7 +144,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 
     case 'd':
-      socket_type = SO_DEBUG;
+      socket_type |= SO_DEBUG;
       break;
 
     case 'i':
@@ -158,7 +158,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 
     case 'r':
-      socket_type = SO_DONTROUTE;
+      socket_type |= SO_DONTROUTE;
       break;
 
     case 's':
diff --git a/ping/ping6.c b/ping/ping6.c
index bf89352..a65b875 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -110,7 +110,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 
     case 'd':
-      socket_type = SO_DEBUG;
+      socket_type |= SO_DEBUG;
       break;
 
     case 'f':
@@ -150,7 +150,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 
     case 'r':
-      socket_type = SO_DEBUG;
+      socket_type |= SO_DONTROUTE;
       break;
 
     case 'w':


hooks/post-receive
-- 
GNU Inetutils