diff options
| author | fenner <fenner@FreeBSD.org> | 1999-01-20 07:55:57 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 1999-01-20 07:55:57 +0000 |
| commit | cdafdeb1c3a36e7c0b59fd4f6f0b90b3b1cc27f8 (patch) | |
| tree | ccf540c94528b6508bed4892f971ca6ff14c68a7 /usr.sbin/mrouted/mapper.c | |
| parent | 1de14dda19dab2b943562326a3d97281534dc709 (diff) | |
| download | FreeBSD-src-cdafdeb1c3a36e7c0b59fd4f6f0b90b3b1cc27f8.zip FreeBSD-src-cdafdeb1c3a36e7c0b59fd4f6f0b90b3b1cc27f8.tar.gz | |
Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's
merge algorithm failed on several files, and the translation of the
mrouted man page to mdoc didn't help...
Diffstat (limited to 'usr.sbin/mrouted/mapper.c')
| -rw-r--r-- | usr.sbin/mrouted/mapper.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c index e440bbc..0a5f33c 100644 --- a/usr.sbin/mrouted/mapper.c +++ b/usr.sbin/mrouted/mapper.c @@ -1,5 +1,7 @@ /* Mapper for connections between MRouteD multicast routers. * Written by Pavel Curtis <Pavel@PARC.Xerox.Com> + * + * mapper.c,v 3.8.4.3 1998/01/06 01:57:47 fenner Exp */ /* @@ -21,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "$Id: mapper.c,v 1.12 1998/01/16 07:17:43 charnier Exp $"; + "$Id: mapper.c,v 1.13 1998/06/09 05:01:30 imp Exp $"; #endif /* not lint */ #include <err.h> @@ -910,7 +912,7 @@ int main(argc, argv) int addrlen = sizeof(addr); addr.sin_family = AF_INET; -#if (defined(BSD) && (BSD >= 199103)) +#ifdef HAVE_SA_LEN addr.sin_len = sizeof addr; #endif addr.sin_addr.s_addr = dvmrp_group; |
