From: Loïc Tortay <tortay@cc.in2p3.fr>
Date: Thu, 13 Oct 2005 19:27:33 +0000 (+0000)
Subject: STABLE140-solaris10-nfs-really-20051013
X-Git-Tag: openafs-stable-1_4_0-rc8~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6422b6dde54bdc3f320e69f9bf4a4947474ad3e7;p=packages%2Fo%2Fopenafs.git

STABLE140-solaris10-nfs-really-20051013

FIXES 22318

fix array size so this all works


(cherry picked from commit f49876b8cb2acb94accda10d190c6cfe41a16b81)
---

diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c
index d89ff0217..41076ac4a 100644
--- a/src/afs/afs_nfsdisp.c
+++ b/src/afs/afs_nfsdisp.c
@@ -63,8 +63,12 @@ struct afs_nfs2_resp {
 };
 
 #ifndef ACL2_NPROC
+#if defined(AFS_SUN510_ENV)
+#define ACL2_NPROC      6
+#else
 #define ACL2_NPROC      5
 #endif
+#endif
 struct afs_nfs_disp_tbl afs_rfs_disp_tbl[RFS_NPROC];
 struct afs_nfs_disp_tbl afs_acl_disp_tbl[ACL2_NPROC];
 
@@ -712,7 +716,7 @@ afs_acl2_getxattrdir(char *args, char *xp, char *exp, char *rp, char *crp)
 }
 #endif
 
-struct afs_nfs_disp_tbl afs_acl_disp_tbl[5] = {
+struct afs_nfs_disp_tbl afs_acl_disp_tbl[ACL2_NPROC] = {
     {afs_nfs2_null},
     {afs_acl2_getacl},
     {afs_acl2_setacl},
@@ -749,8 +753,12 @@ afs_xlatorinit_v2(struct rfs_disp_tbl *_rfs_tbl,
 #endif
 
 #ifndef ACL3_NPROC
+#if defined(AFS_SUN510_ENV)
+#define ACL3_NPROC      4
+#else
 #define ACL3_NPROC      3
 #endif
+#endif
 
 struct afs_nfs_disp_tbl afs_rfs3_disp_tbl[RFS3_NPROC];
 struct afs_nfs_disp_tbl afs_acl3_disp_tbl[ACL3_NPROC];
@@ -1611,7 +1619,7 @@ afs_acl3_getxattrdir(char *args, char *xp, char *exp, char *rp, char *crp)
 }
 #endif
 
-struct afs_nfs_disp_tbl afs_acl3_disp_tbl[3] = {
+struct afs_nfs_disp_tbl afs_acl3_disp_tbl[ACL3_NPROC] = {
     {afs_nfs2_null},
     {afs_acl3_getacl},
     {afs_acl3_setacl},