From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 21 May 2003 22:41:21 +0000 (+0000)
Subject: STABLE12-linux-group-syscalls-return-long-20030521
X-Git-Tag: openafs-stable-1_2_10~57
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d6deb4ce3556a108b40f9c4221ee2da729879c51;p=packages%2Fo%2Fopenafs.git

STABLE12-linux-group-syscalls-return-long-20030521


these return long. also call the underlying handler expecting to get a long
back


(cherry picked from commit 4b88ff73550199014d552f9fddc74785fa5eccdb)
---

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 3c6947237..4c1a2e3e9 100644
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -109,11 +109,11 @@ int setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag, int change_pare
 }
 
 
-/* Intercept the standard system call. */
+/* Intercept the standard system call. XXX take old_gid_t in new kernels */
 extern long (*sys_setgroupsp)(int gidsetsize, gid_t *grouplist);
 asmlinkage long afs_xsetgroups(int gidsetsize, gid_t *grouplist)
 {
-    int code;
+    long code;
     cred_t *cr = crref();
     afs_uint32 junk;
     int old_pag;
@@ -143,10 +143,10 @@ asmlinkage long afs_xsetgroups(int gidsetsize, gid_t *grouplist)
 
 #if defined(AFS_LINUX24_ENV)
 /* Intercept the standard uid32 system call. */
-extern int (*sys_setgroups32p)(int gidsetsize, gid_t *grouplist);
-asmlinkage int afs_xsetgroups32(int gidsetsize, gid_t *grouplist)
+extern long (*sys_setgroups32p)(int gidsetsize, gid_t *grouplist);
+asmlinkage long afs_xsetgroups32(int gidsetsize, gid_t *grouplist)
 {
-    int code;
+    long code;
     cred_t *cr = crref();
     afs_uint32 junk;
     int old_pag;