On 3/10/06, Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> wrote: > On 3/10/06, Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> wrote: > > On 3/10/06, Xiaolan Zhang <[EMAIL PROTECTED]> wrote: > > > Hi, > > > > > > I will work on a fix. > > > > Thanks. > > More breakage, this time with "make allmodconfig", please fix. > > - Arnaldo > > /pub/scm/linux/kernel/git/acme/net-2.6.17/security/dummy.c: In > function 'security_fixup_ops': > /pub/scm/linux/kernel/git/acme/net-2.6.17/security/dummy.c:1011: > error: 'struct security_operations' has no member named > 'socket_getpeersec' > /pub/scm/linux/kernel/git/acme/net-2.6.17/security/dummy.c:1011: > error: 'struct security_operations' has no member named > 'socket_getpeersec' > /pub/scm/linux/kernel/git/acme/net-2.6.17/security/dummy.c:1011: > error: 'dummy_socket_getpeersec' undeclared (first use in this > function) > /pub/scm/linux/kernel/git/acme/net-2.6.17/security/dummy.c:1011: > error: (Each undeclared identifier is reported only once > /pub/scm/linux/kernel/git/acme/net-2.6.17/security/dummy.c:1011: > error: for each function it appears in.)
Is the attached patch enough? If so I can put into my net-2.6.17 tree and push to DaveM in half an hour or so after I check that there is no more build breakage in netland. - Arnaldo
diff --git a/security/dummy.c b/security/dummy.c index a326d6e..a678f09 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -1008,7 +1008,8 @@ void security_fixup_ops (struct security set_to_dummy_if_null(ops, socket_getsockopt); set_to_dummy_if_null(ops, socket_shutdown); set_to_dummy_if_null(ops, socket_sock_rcv_skb); - set_to_dummy_if_null(ops, socket_getpeersec); + set_to_dummy_if_null(ops, socket_getpeersec_stream); + set_to_dummy_if_null(ops, socket_getpeersec_dgram); set_to_dummy_if_null(ops, sk_alloc_security); set_to_dummy_if_null(ops, sk_free_security); set_to_dummy_if_null(ops, sk_getsid);
