Use version 3 to avoid warning message in newer kernels.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Sun, 28 Sep 2008 11:24:07 +0000 (11:24 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Sun, 28 Sep 2008 11:24:07 +0000 (11:24 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2788 94cd875c-1c1d-0410-91d2-eb244daf1a30

src/capability-compat.h
src/rpm-fake.c
src/vserver-info.c

index 8a684c6..b520ab0 100644 (file)
@@ -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
index 0e3a936..6d52e98 100644 (file)
@@ -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;
index 014489d..8a13584 100644 (file)
@@ -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;