From: Matt Benjamin <matt@linuxbox.com>
Date: Thu, 22 Jan 2009 21:38:55 +0000 (+0000)
Subject: DEVEL15-fbsd-ignore-sigsys-20090123
X-Git-Tag: openafs-devel-1_5_57~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b0bff7cb052a4cf03e6a15529a2b331165f624ab;p=packages%2Fo%2Fopenafs.git

DEVEL15-fbsd-ignore-sigsys-20090123

LICENSE IPL10
FIXES 123867

wrong but a step forward


(cherry picked from commit 6784222ac1741d9da18ba5d66fdd5057343ab8b1)
---

diff --git a/src/kauth/user.c b/src/kauth/user.c
index 7a188d7a2..8cdb6fb61 100644
--- a/src/kauth/user.c
+++ b/src/kauth/user.c
@@ -185,7 +185,7 @@ ka_UserAuthenticateGeneral(afs_int32 flags, char *name, char *instance, char *re
     }
 #endif
 
-#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && !defined(AFS_XBSD_ENV)
+#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && (!defined(AFS_XBSD_ENV) || defined(AFS_FBSD_ENV))
     /* handle smoothly the case where no AFS system calls exists (yet) */
     old = (int (*)())signal(SIGSYS, SIG_IGN);
 #endif
diff --git a/src/sys/afssyscalls.c b/src/sys/afssyscalls.c
index e2335d4ee..4b04f5f54 100644
--- a/src/sys/afssyscalls.c
+++ b/src/sys/afssyscalls.c
@@ -338,6 +338,11 @@ int
 lpioctl(char *path, int cmd, char *cmarg, int follow)
 {
     int errcode, rval;
+#if defined(AFS_FBSD_ENV)
+    /* As kauth/user.c says, handle smoothly the case where no AFS system call
+     *  exists (yet).  Why don't more platforms have trouble here?  Matt */
+    sig_t old = (int (*)())signal(SIGSYS, SIG_IGN);
+#endif
 
 #if defined(AFS_LINUX20_ENV)
     rval = proc_afs_syscall(AFSCALL_PIOCTL, (long)path, cmd, (long)cmarg,