patches/strace/4.5.15/180-undef-PACKET_MEMBERSHIP.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jun 22 23:49:23 2010 +0200 (2010-06-22)
branch1.7
changeset 1998 110ba570a70a
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts/wrapper: fix wrong test when checking access to the reall tool

In C, the proper syntax for a bit-wise OR is a single '|', not two.

It worked so far because all was well:
- X_OK == 1
- R_OK||X_OK == 1
- the file we searched for had the x-bit set
-> access( file, R_OK||X_OK ) worked
- inicidentally, the file we searched for also had the r-bit set,
but we were not testing that in fact.
(transplanted from eebcaff6626f09af4f69b7b06f1246a06769d0af)
     1 diff -dur strace-4.5.15.orig/net.c strace-4.5.15/net.c
     2 --- strace-4.5.15.orig/net.c	2006-12-13 20:57:23.000000000 +0100
     3 +++ strace-4.5.15/net.c	2007-07-14 19:29:36.000000000 +0200
     4 @@ -800,8 +800,12 @@
     5  
     6  #ifdef SOL_PACKET
     7  static const struct xlat sockpacketoptions[] = {
     8 +#if defined(PACKET_ADD_MEMBERSHIP)
     9  	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
    10 +#endif
    11 +#if defined(PACKET_DROP_MEMBERSHIP)
    12  	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
    13 +#endif
    14  #if defined(PACKET_RECV_OUTPUT)
    15  	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
    16  #endif