diff options
| author | wollman <wollman@FreeBSD.org> | 1996-12-17 21:11:59 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1996-12-17 21:11:59 +0000 |
| commit | 1923b893d65ea28218f79f2d1b49ef6ce00918e3 (patch) | |
| tree | 45aaf2920b1a943442eb7deab0b2dbd4d40c4913 | |
| parent | 883df1fcd31963762439552ed35e25231827c20e (diff) | |
| download | FreeBSD-src-1923b893d65ea28218f79f2d1b49ef6ce00918e3.zip FreeBSD-src-1923b893d65ea28218f79f2d1b49ef6ce00918e3.tar.gz | |
Merge from vendor branch.
| -rw-r--r-- | sbin/routed/defs.h | 7 | ||||
| -rw-r--r-- | sbin/routed/rtquery/rtquery.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h index 1f8ec00..2c314f3 100644 --- a/sbin/routed/defs.h +++ b/sbin/routed/defs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)defs.h 8.1 (Berkeley) 6/5/93 - * $Id: defs.h,v 1.4 1996/12/10 17:07:36 wollman Exp $ + * $Id: defs.h,v 1.5 1996/12/11 21:04:08 wollman Exp $ */ /* Definitions for RIPv2 routing process. @@ -72,6 +72,7 @@ #include <stdarg.h> #include <syslog.h> #include <time.h> +#include <sys/time.h> #include <sys/types.h> #include <sys/param.h> #include <sys/ioctl.h> @@ -91,10 +92,6 @@ #define RIPVERSION RIPv2 #include <protocols/routed.h> -#ifdef sgi -#define USE_PASSIFNAME -#endif - /* Type of an IP address. * Some systems do not like to pass structures, so do not use in_addr. diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index f542147..bddf590 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -106,7 +106,7 @@ static u_int std_mask(u_int); static int parse_quote(char **, char *, char *, char *, int); -int +void main(int argc, char *argv[]) { @@ -244,7 +244,7 @@ main(int argc, if ((not_trace && trace) || argc == 0) { usage: fprintf(stderr, "%s: [-np1v] [-r tgt_rt] [-w wtime]" " [-a type=passwd] host1 [host2 ...]\n" - "or\t-t {on=filename|more|off|on=dump/../table}" + "or\t-t {on=filename|more|off|dump}" " host1 [host2 ...]\n", pgmname); exit(1); |
