Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/usr.sbin/rarpd Pull up revision 1.46 (requested by thor...



details:   https://anonhg.NetBSD.org/src/rev/b28aff11c3c0
branches:  netbsd-1-6
changeset: 529171:b28aff11c3c0
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Oct 21 01:47:26 2002 +0000

description:
Pull up revision 1.46 (requested by thorpej in ticket #920):
Allow more than one interface to be specified on the command line.

diffstat:

 usr.sbin/rarpd/rarpd.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r c7e367ddeed6 -r b28aff11c3c0 usr.sbin/rarpd/rarpd.c
--- a/usr.sbin/rarpd/rarpd.c    Fri Oct 18 19:55:35 2002 +0000
+++ b/usr.sbin/rarpd/rarpd.c    Mon Oct 21 01:47:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rarpd.c,v 1.44 2002/01/11 05:33:22 itojun Exp $        */
+/*     $NetBSD: rarpd.c,v 1.44.2.1 2002/10/21 01:47:26 lukem Exp $     */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -28,7 +28,7 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: rarpd.c,v 1.44 2002/01/11 05:33:22 itojun Exp $");
+__RCSID("$NetBSD: rarpd.c,v 1.44.2.1 2002/10/21 01:47:26 lukem Exp $");
 #endif
 
 
@@ -138,7 +138,6 @@
        char  **argv;
 {
        int     op;
-       char   *ifname, *hostname;
 
        /* All error reporting is done through syslogs. */
        openlog("rarpd", LOG_PID, LOG_DAEMON);
@@ -167,9 +166,10 @@
                        /* NOTREACHED */
                }
        }
-       ifname = argv[optind++];
-       hostname = ifname ? argv[optind] : 0;
-       if ((aflag && ifname) || (!aflag && ifname == 0))
+       argc -= optind;
+       argv += optind;
+
+       if ((aflag && argc != 0) || (!aflag && argc == 0))
                usage();
 
        if ((!fflag) && (!dflag)) {
@@ -180,8 +180,10 @@
 
        if (aflag)
                init_all();
-       else
-               init_one(ifname, INADDR_ANY);
+       else {
+               while (argc--)
+                       init_one(*argv++, INADDR_ANY);
+       }
 
        rarp_loop();
        /* NOTREACHED */



Home | Main Index | Thread Index | Old Index