Date: Fri, 31 Oct 2003 10:58:51 -0800 From: Brooks Davis <brooks@one-eyed-alien.net> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sbin Makefile src/usr.sbin Makefile Message-ID: <20031031185851.GC12447@Odin.AC.HMC.Edu> In-Reply-To: <200310311854.h9VIskIh002430@repoman.freebsd.org> References: <200310311854.h9VIskIh002430@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Fri, Oct 31, 2003 at 10:54:46AM -0800, Brooks Davis wrote:
> brooks 2003/10/31 10:54:46 PST
>
> FreeBSD src repository
>
> Modified files:
> sbin Makefile
> usr.sbin Makefile
> Log:
> Temporarily disconnect ipfstat, ipnat, and ipftest to unbreak world.
The following patch will fix them, but the files are on the vendor
branch and I made the mistake of commiting the rest of the change
without thinking it through. :-(
-- Brooks
Index: contrib/ipfilter/ipt.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipt.c,v
retrieving revision 1.1.1.12
diff -u -p -r1.1.1.12 ipt.c
--- contrib/ipfilter/ipt.c 15 Feb 2003 06:27:40 -0000 1.1.1.12
+++ contrib/ipfilter/ipt.c 31 Oct 2003 18:37:17 -0000
@@ -443,7 +443,8 @@ char *getifname(ptr)
void *ptr;
{
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
#else
char buf[32], *s;
int len;
@@ -458,7 +459,8 @@ void *ptr;
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X";
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
return strdup(netif.if_xname);
#else
if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
Index: contrib/ipfilter/kmem.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/kmem.c,v
retrieving revision 1.1.1.10
diff -u -p -r1.1.1.10 kmem.c
--- contrib/ipfilter/kmem.c 15 Feb 2003 06:27:40 -0000 1.1.1.10
+++ contrib/ipfilter/kmem.c 31 Oct 2003 18:37:17 -0000
@@ -204,7 +204,8 @@ void *ptr;
return ifname;
#else
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
#else
char buf[32];
int len;
@@ -219,7 +220,8 @@ void *ptr;
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X";
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
return strdup(netif.if_xname);
# else
if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
--
Any statement of the form "X is the one, true Y" is FALSE.
PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE/orDqXY6L6fI4GtQRAkuEAJ4oOVqeUePKdCgzgPsRaNyQc8QuIQCgwWFZ
nZVcDHnk1xrAp8zfUFio0rA=
=dGWI
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031031185851.GC12447>