diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
| commit | cc3f4b99653c34ae64f8a1fddea370abefef680e (patch) | |
| tree | 8ce0ddd0e6f508bd20c77429c448969589170fae /sbin/route | |
| parent | f974b33f6ed6f35170c520d2be111bfc2c3954cd (diff) | |
| parent | 16aa1f0950a3b4407a36ecc96acc8ca0710ebd91 (diff) | |
| download | src-cc3f4b99653c34ae64f8a1fddea370abefef680e.tar.gz src-cc3f4b99653c34ae64f8a1fddea370abefef680e.zip | |
Merge from head
Notes
Notes:
svn path=/projects/bmake/; revision=265720
Diffstat (limited to 'sbin/route')
| -rw-r--r-- | sbin/route/Makefile | 2 | ||||
| -rw-r--r-- | sbin/route/route.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sbin/route/Makefile b/sbin/route/Makefile index 569d21af07a0..25134e473b66 100644 --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= route MAN= route.8 diff --git a/sbin/route/route.c b/sbin/route/route.c index 794f1430397b..9b3bb9533f61 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1727,8 +1727,6 @@ print_getmsg(struct rt_msghdr *rtm, int msglen, int fib) (sp[RTAX_IFP]->sa_family != AF_LINK || ((struct sockaddr_dl *)(void *)sp[RTAX_IFP])->sdl_nlen == 0)) sp[RTAX_IFP] = NULL; - if (sp[RTAX_DST] && sp[RTAX_NETMASK]) - sp[RTAX_NETMASK]->sa_family = sp[RTAX_DST]->sa_family; /* XXX */ if (sp[RTAX_DST]) (void)printf("destination: %s\n", routename(sp[RTAX_DST])); if (sp[RTAX_NETMASK]) |