X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2Fafs_call.c;h=68a313aa0d915f80208a2ac09a9ae7d80beb49a1;hp=771b95a97c15afe3707ef91bbb01b173cb0b68f0;hb=125e4511a9715a5df7dda265373d97a21177ea21;hpb=6bc5c0899a9eb6c134c0079406fe28113e5cbeaf

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 771b95a..68a313a 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -457,26 +457,27 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6)
 #endif /* AFS_SGI61_ENV */
 
     AFS_STATCNT(afs_syscall_call);
+    if (!afs_suser(
 #ifdef	AFS_SUN5_ENV
-    if (!afs_suser(CRED()) && (parm != AFSOP_GETMTU)
-	&& (parm != AFSOP_GETMASK)) {
-	/* only root can run this code */
-	return (EACCES);
+		   CRED()
 #else
-    if (!afs_suser(NULL) && (parm != AFSOP_GETMTU)
-	&& (parm != AFSOP_GETMASK)) {
+		   NULL
+#endif
+		   ) && (parm != AFSOP_GETMTU) && (parm != AFSOP_GETMASK)) {
 	/* only root can run this code */
+#if defined(AFS_OSF_ENV) || defined(AFS_SUN5_ENV) || defined(KERNEL_HAVE_UERROR)
 #if defined(KERNEL_HAVE_UERROR)
 	setuerror(EACCES);
-	return (EACCES);
+#endif
+	code = EACCES;
 #else
-#if defined(AFS_OSF_ENV)
-	return EACCES;
-#else /* AFS_OSF_ENV */
-	return EPERM;
-#endif /* AFS_OSF_ENV */
+	code = EPERM;
 #endif
+	AFS_GLOCK();
+#ifdef AFS_DARWIN80_ENV
+	put_vfs_context();
 #endif
+	goto out;
     }
     AFS_GLOCK();
 #ifdef AFS_DARWIN80_ENV
@@ -763,7 +764,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6)
 	    afs_osi_Sleep(&afs_initState);
 
 #ifdef AFS_DARWIN80_ENV
-    get_vfs_context();
+	get_vfs_context();
 #endif
 	/* do it by inode */
 #ifdef AFS_SGI62_ENV
@@ -771,7 +772,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6)
 #endif
 	code = afs_InitCacheFile(NULL, ainode);
 #ifdef AFS_DARWIN80_ENV
-    put_vfs_context();
+	put_vfs_context();
 #endif
     } else if (parm == AFSOP_ROOTVOLUME) {
 	/* wait for basic init */
@@ -811,7 +812,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6)
 	    else if (parm == AFSOP_CELLINFO)
 		code = afs_InitCellInfo(tbuffer);
 #ifdef AFS_DARWIN80_ENV
-    put_vfs_context();
+	    put_vfs_context();
 #endif
 	}
 	osi_FreeSmallSpace(tbuffer);
@@ -1050,9 +1051,6 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6)
 	code = EINVAL;
 
   out:
-#ifdef AFS_DARWIN80_ENV /* to balance the put in afs3_syscall() */
-    get_vfs_context();
-#endif
     AFS_GUNLOCK();
 #ifdef AFS_LINUX20_ENV
     return -code;