1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-20 01:09:41 +02:00
openwrt-xburst/package/dnsmasq/patches/200-backports.patch

31 lines
1.2 KiB
Diff
Raw Normal View History

Index: dnsmasq-2.42/src/dnsmasq.c
===================================================================
--- dnsmasq-2.42.orig/src/dnsmasq.c 2008-06-28 23:37:18.000000000 +0200
+++ dnsmasq-2.42/src/dnsmasq.c 2008-06-28 23:37:20.000000000 +0200
@@ -297,8 +297,11 @@
capget(hdr, NULL);
if (hdr->version != LINUX_CAPABILITY_VERSION_1)
{
- /* if not version 1, use version 2 */
- hdr->version = LINUX_CAPABILITY_VERSION_2;
+ /* if unknown version, use largest supported version (3)
+ * backported fix from 2.43 to suppress kernel warning
+ */
+ if (hdr->version != LINUX_CAPABILITY_VERSION_2)
+ hdr->version = LINUX_CAPABILITY_VERSION_3;
capsize = 2;
}
hdr->pid = 0; /* this process */
Index: dnsmasq-2.42/src/dnsmasq.h
===================================================================
--- dnsmasq-2.42.orig/src/dnsmasq.h 2008-06-28 23:37:48.000000000 +0200
+++ dnsmasq-2.42/src/dnsmasq.h 2008-06-28 23:37:55.000000000 +0200
@@ -100,6 +100,7 @@
extern int capget(cap_user_header_t header, cap_user_data_t data);
#define LINUX_CAPABILITY_VERSION_1 0x19980330
#define LINUX_CAPABILITY_VERSION_2 0x20071026
+#define LINUX_CAPABILITY_VERSION_3 0x20080522
#include <sys/prctl.h>
#elif defined(HAVE_SOLARIS_PRIVS)