From: Daniel Hokka Zakrisson Date: Sun, 28 Sep 2008 11:24:07 +0000 (+0000) Subject: Use version 3 to avoid warning message in newer kernels. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e420e78a3a505f01b601156bf301f8c381729aea;p=util-vserver.git Use version 3 to avoid warning message in newer kernels. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2788 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/src/capability-compat.h b/src/capability-compat.h index 8a684c6..b520ab0 100644 --- a/src/capability-compat.h +++ b/src/capability-compat.h @@ -34,6 +34,6 @@ extern int capset (struct __user_cap_header_struct *, struct __user_cap_data_str # define _LINUX_CAPABILITY_VERSION_1 _LINUX_CAPABILITY_VERSION #endif -#ifndef _LINUX_CAPABILITY_VERSION_2 -# define _LINUX_CAPABILITY_VERSION_2 0x20071026 +#ifndef _LINUX_CAPABILITY_VERSION_3 +# define _LINUX_CAPABILITY_VERSION_3 0x20080522 #endif diff --git a/src/rpm-fake.c b/src/rpm-fake.c index 0e3a936..6d52e98 100644 --- a/src/rpm-fake.c +++ b/src/rpm-fake.c @@ -423,13 +423,13 @@ reduceCapabilities() struct __user_cap_header_struct header; struct __user_cap_data_struct user[2]; - header.version = _LINUX_CAPABILITY_VERSION_2; + header.version = _LINUX_CAPABILITY_VERSION_3; header.pid = 0; retry: if (capget(&header, user)==-1) { if (!retried && - header.version != _LINUX_CAPABILITY_VERSION_2) { + header.version != _LINUX_CAPABILITY_VERSION_3) { header.version = _LINUX_CAPABILITY_VERSION_1; retried = 1; goto retry; diff --git a/src/vserver-info.c b/src/vserver-info.c index 014489d..8a13584 100644 --- a/src/vserver-info.c +++ b/src/vserver-info.c @@ -189,7 +189,7 @@ verifyCap() struct __user_cap_header_struct header; struct __user_cap_data_struct user[2]; - header.version = _LINUX_CAPABILITY_VERSION_2; + header.version = _LINUX_CAPABILITY_VERSION_3; header.pid = 0; if (getuid()!=0) { @@ -205,7 +205,7 @@ verifyCap() retry: if (capget(&header, user)==-1) { if (!retried && - header.version != _LINUX_CAPABILITY_VERSION_2) { + header.version != _LINUX_CAPABILITY_VERSION_3) { header.version = _LINUX_CAPABILITY_VERSION_1; retried = 1; goto retry;