Re: rsbac/adf/adf_main.c:2060: error: 'struct inet_sock' has no member named 'daddr'
Gergely Lónyai <[email protected]>
| Newsgroups | gmane.linux.rsbac |
|---|---|
| Organization | Mandriva Cooker |
| Message-ID | <[email protected]> |
Date: Tue, 6 Apr 2010 15:58:40 +0200 From: Amon Ott <[email protected]> >On Tuesday 06 April 2010 wrote Gergely Lónyai: >> Hi, >> >> I used the current git version. >> >> Please see this log: >> http://kenobi.mandriva.com/queue/failure/cooker/contrib/release/20100406125 >>936.aleph.kenobi.8719/log/kernel-rsbac-2.6.33.2-1mdv2010.1/build.0.201004061 >>30235.log > >This is from branch rsbac-1.4-2.6.33? My versions on disk have all that fixed, >I really wonder what is wrong here. Some git blues it seems, still need to >learn a bit. > >Amon. I resolved some problem (attached the patch), but i don't understand it: rsbac/data_structures/aci_data_structures.c: In function 'rsbac_read_open': rsbac/data_structures/aci_data_structures.c:2373: error: implicit declaration of function 'init_file' Aleph :-( _______________________________________________ rsbac mailing list [email protected] http://www.rsbac.org/mailman/listinfo/rsbac
fix-patch-linux-2.6.33.2-rsbac-1.4.3.patch
(text/x-patch, 3.5 KB)
diff -ru linux-2.6.33/rsbac/adf/adf_main.c linux-2.6.33.aleph/rsbac/adf/adf_main.c
--- linux-2.6.33/rsbac/adf/adf_main.c 2010-04-10 16:14:04.000000000 +0200
+++ linux-2.6.33.aleph/rsbac/adf/adf_main.c 2010-04-10 14:41:58.000000000 +0200
@@ -2057,7 +2057,7 @@
)
{
i_tid.process = caller_pid;
- i_attr_val.remote_ip = inet_sk(tid.netobj.sock_p->sk)->daddr;
+ i_attr_val.remote_ip = inet_sk(tid.netobj.sock_p->sk)->inet_daddr;
/* set program based log for new process */
if (rsbac_set_attr(SW_GEN,
T_PROCESS,
diff -ru linux-2.6.33/rsbac/adf/jail/jail_main.c linux-2.6.33.aleph/rsbac/adf/jail/jail_main.c
--- linux-2.6.33/rsbac/adf/jail/jail_main.c 2009-07-22 18:20:26.000000000 +0200
+++ linux-2.6.33.aleph/rsbac/adf/jail/jail_main.c 2010-04-10 16:22:40.000000000 +0200
@@ -240,20 +240,20 @@
else {
if (((jail_ip ==
inet_sk(tid.netobj.sock_p->sk)->
- rcv_saddr)
+ inet_rcv_saddr)
&& (jail_ip ==
inet_sk(tid.netobj.sock_p->sk)->
- saddr)
+ inet_saddr)
)
|| (
(jail_flags &
JAIL_allow_inet_localhost)
&&
((inet_sk(tid.netobj.sock_p->sk)->
- saddr == RSBAC_JAIL_LOCALHOST)
+ inet_saddr == RSBAC_JAIL_LOCALHOST)
|| (
inet_sk(tid.netobj.sock_p->sk)->
- daddr == RSBAC_JAIL_LOCALHOST)
+ inet_daddr == RSBAC_JAIL_LOCALHOST)
)
)
#if defined(CONFIG_RSBAC_JAIL_NET_ADJUST)
@@ -261,9 +261,9 @@
(jail_flags &
JAIL_auto_adjust_inet_any)
&& (inet_sk(tid.netobj.sock_p->sk)->
- rcv_saddr == INADDR_ANY)
+ inet_rcv_saddr == INADDR_ANY)
&& (inet_sk(tid.netobj.sock_p->sk)->
- saddr == INADDR_ANY)
+ inet_saddr == INADDR_ANY)
)
#endif
)
@@ -1268,9 +1268,9 @@
}
if (i_attr_val2.
jail_flags & JAIL_auto_adjust_inet_any) {
- inet_sk(tid.netobj.sock_p->sk)->rcv_saddr =
+ inet_sk(tid.netobj.sock_p->sk)->inet_rcv_saddr =
i_attr_val1.jail_ip;
- inet_sk(tid.netobj.sock_p->sk)->saddr =
+ inet_sk(tid.netobj.sock_p->sk)->inet_saddr =
i_attr_val1.jail_ip;
}
return 0;
diff -ru linux-2.6.33/rsbac/data_structures/aci_data_structures.c linux-2.6.33.aleph/rsbac/data_structures/aci_data_structures.c
--- linux-2.6.33/rsbac/data_structures/aci_data_structures.c 2009-11-27 14:39:26.000000000 +0100
+++ linux-2.6.33.aleph/rsbac/data_structures/aci_data_structures.c 2010-04-10 16:21:14.000000000 +0200
@@ -14141,11 +14141,11 @@
} else {
rsbac_net_desc_p->address =
&inet_sk(netobj_p->sock_p->sk)->
- rcv_saddr;
+ inet_rcv_saddr;
rsbac_net_desc_p->address_len =
sizeof(__u32);
rsbac_net_desc_p->port =
- inet_sk(netobj_p->sock_p->sk)->num;
+ inet_sk(netobj_p->sock_p->sk)->inet_num;
}
dev = ip_dev_find(&init_net, *(__u32 *) rsbac_net_desc_p->address);
@@ -14194,12 +14194,12 @@
ntohs(addr->sin_port);
} else {
rsbac_net_desc_p->address =
- &inet_sk(netobj_p->sock_p->sk)->daddr;
+ &inet_sk(netobj_p->sock_p->sk)->inet_daddr;
rsbac_net_desc_p->address_len =
sizeof(__u32);
rsbac_net_desc_p->port =
ntohs(inet_sk(netobj_p->sock_p->sk)->
- dport);
+ inet_dport);
}
dev = ip_dev_find(&init_net, *(__u32 *) rsbac_net_desc_p->address);
signature.asc
(application/pgp-signature, 198 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkvAjeAACgkQp/MJ3Iz42ljP6ACfS2G3Bhsg+hv3z3UMT4Bk2y6w DFoAn3YCe/pU29rwNtAMVQOkqnzKohV+ =erMi -----END PGP SIGNATURE-----