Author: mguevara Date: Sat Aug 9 22:14:46 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fixes sizes of xt_owner_match_info, ipt_owner_info and ip6t_owner_info
to match the size of the structs in the kernel with vs patches
---- Files affected:
SOURCES:
iptables-owner-struct-size-vs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/iptables-owner-struct-size-vs.patch
diff -u /dev/null SOURCES/iptables-owner-struct-size-vs.patch:1.1
--- /dev/null Sun Aug 10 00:14:47 2008
+++ SOURCES/iptables-owner-struct-size-vs.patch Sun Aug 10 00:14:41 2008
@@ -0,0 +1,63 @@
+diff -NurpP --minimal iptables-1.4.1.1.orig/include/linux/netfilter/xt_owner.h
iptables-1.4.1.1.mod/include/linux/netfilter/xt_owner.h
+--- iptables-1.4.1.1.orig/include/linux/netfilter/xt_owner.h 2008-06-16
15:12:40.000000000 +0200
++++ iptables-1.4.1.1.mod/include/linux/netfilter/xt_owner.h 2008-08-06
14:54:05.000000000 +0200
+@@ -5,12 +5,16 @@ enum {
+ XT_OWNER_UID = 1 << 0,
+ XT_OWNER_GID = 1 << 1,
+ XT_OWNER_SOCKET = 1 << 2,
++ XT_OWNER_XID = 1 << 3,
++ XT_OWNER_NID = 1 << 4,
+ };
+
+ struct xt_owner_match_info {
+ u_int32_t uid_min, uid_max;
+ u_int32_t gid_min, gid_max;
+ u_int8_t match, invert;
++ u_int32_t nid;
++ u_int32_t xid;
+ };
+
+ #endif /* _XT_OWNER_MATCH_H */
+diff -NurpP --minimal
iptables-1.4.1.1.orig/include/linux/netfilter_ipv4/ipt_owner.h
iptables-1.4.1.1.mod/include/linux/netfilter_ipv4/ipt_owner.h
+--- iptables-1.4.1.1.orig/include/linux/netfilter_ipv4/ipt_owner.h
2008-06-16 15:12:40.000000000 +0200
++++ iptables-1.4.1.1.mod/include/linux/netfilter_ipv4/ipt_owner.h
2008-08-06 14:56:05.000000000 +0200
+@@ -7,6 +7,9 @@
+ #define IPT_OWNER_PID 0x04
+ #define IPT_OWNER_SID 0x08
+ #define IPT_OWNER_COMM 0x10
++#define IPT_OWNER_NID 0x20
++#define IPT_OWNER_XID 0x40
++
+
+ struct ipt_owner_info {
+ uid_t uid;
+@@ -15,6 +18,8 @@ struct ipt_owner_info {
+ pid_t sid;
+ char comm[16];
+ u_int8_t match, invert; /* flags */
++ u_int32_t nid;
++ u_int32_t xid;
+ };
+
+ #endif /*_IPT_OWNER_H*/
+diff -NurpP --minimal
iptables-1.4.1.1.orig/include/linux/netfilter_ipv6/ip6t_owner.h
iptables-1.4.1.1.mod/include/linux/netfilter_ipv6/ip6t_owner.h
+--- iptables-1.4.1.1.orig/include/linux/netfilter_ipv6/ip6t_owner.h
2008-06-16 15:12:40.000000000 +0200
++++ iptables-1.4.1.1.mod/include/linux/netfilter_ipv6/ip6t_owner.h
2008-08-06 14:57:23.000000000 +0200
+@@ -6,6 +6,8 @@
+ #define IP6T_OWNER_GID 0x02
+ #define IP6T_OWNER_PID 0x04
+ #define IP6T_OWNER_SID 0x08
++#define IP6T_OWNER_NID 0x20
++#define IP6T_OWNER_XID 0x40
+
+ struct ip6t_owner_info {
+ uid_t uid;
+@@ -13,6 +15,8 @@ struct ip6t_owner_info {
+ pid_t pid;
+ pid_t sid;
+ u_int8_t match, invert; /* flags */
++ u_int32_t nid;
++ u_int32_t xid;
+ };
+
+ #endif /*_IPT_OWNER_H*/
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
