>From summer@OS2.ami.com.au Fri May 12 23:07:29 2000
Return-Path: <summer@os2.ami.com.au>
X-Received: from localhost (IDENT:root@localhost [127.0.0.1])
by emu.os2.ami.com.au (8.9.0/8.9.0) with ESMTP id XAA06146
for <listreader@possum>; Fri, 12 May 2000 23:07:29 +0800
X-Received: from os2.ami.com.au
by localhost with POP3 (fetchmail-5.3.8)
for listreader@possum (single-drop); Fri, 12 May 2000 23:07:29 +0800 (WST)
X-Received: (from summer@localhost)
by os2.ami.com.au (8.9.1/8.9.0) id VAA03516
for lister@localhost; Fri, 12 May 2000 21:54:49 +0800
X-Received: from samba.anu.edu.au (samba.anu.edu.au [150.203.164.44])
by os2.ami.com.au (8.9.1/8.9.0) with ESMTP id VAA03511
for <summer@os2.ami.com.au>; Fri, 12 May 2000 21:54:47 +0800
X-Received: from vger.rutgers.edu ([128.6.190.2]:5354 "EHLO vger.rutgers.edu")
by samba.org with ESMTP id <S13175763AbQELNyV>;
Fri, 12 May 2000 23:54:21 +1000
X-Received: by vger.rutgers.edu via listexpand id <S155147AbQELNiM>;
Fri, 12 May 2000 09:38:12 -0400
X-Received: by vger.rutgers.edu id <S154967AbQELN34>;
Fri, 12 May 2000 09:29:56 -0400
X-Received: from dialup-ad-20-100.camtech.net.au ([203.55.245.100]:1053 "EHLO
halfway.linuxcare.com.au") by vger.rutgers.edu with ESMTP
id <S155199AbQELNXE>; Fri, 12 May 2000 09:23:04 -0400
X-Received: from linuxcare.com.au (really [127.0.0.1]) by linuxcare.com.au
via in.smtpd with esmtp
id <m12qFZa-0005RhC@halfway.linuxcare.com.au> (Debian Smail3.2.0.102)
for <linux-kernel@vger.rutgers.edu>; Fri, 12 May 2000 23:03:46 +0930 (CST)
Precedence: bulk
X-Loop: majordomo@vger.rutgers.edu
X-Orcpt: rfc822;linux-kernel-outgoing-dig
X-UIDL: e057ff8e4551beb72c8c00a00300942a
Linus, please apply.
Trivial change someone missed with their grep.
diff -urN -X /tmp/fileTXnAqa --minimal linux-2.3.99-pre7-official/net/ipv4/netfilter/ipt_owner.c working-pre7/net/ipv4/netfilter/ipt_owner.c
--- linux-2.3.99-pre7-official/net/ipv4/netfilter/ipt_owner.c Fri May 12 12:52:38 2000
+++ working-pre7/net/ipv4/netfilter/ipt_owner.c Fri May 12 15:51:33 2000
@@ -21,7 +21,8 @@
p = find_task_by_pid(pid);
if(p && p->files) {
for (i=0; i < p->files->max_fds; i++) {
- if (fcheck_task(p, i) == skb->sk->socket->file) {
+ if (fcheck_files(p->files, i)
+ == skb->sk->socket->file) {
read_unlock(&tasklist_lock);
return 1;
}
@@ -43,7 +44,8 @@
continue;
for (i=0; i < p->files->max_fds; i++) {
- if (fcheck_task(p, i) == skb->sk->socket->file) {
+ if (fcheck_files(p->files, i)
+ == skb->sk->socket->file) {
found = 1;
break;
}
-- Hacking time.- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat May 13 2000 - 11:16:17 EDT