From 6784222ac1741d9da18ba5d66fdd5057343ab8b1 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Thu, 22 Jan 2009 21:38:45 +0000 Subject: [PATCH] fbsd-ignore-sigsys-20090123 LICENSE IPL10 FIXES 123867 wrong but a step forward --- src/kauth/user.c | 2 +- src/sys/pioctl.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/kauth/user.c b/src/kauth/user.c index 7a188d7..8cdb6fb 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/pioctl.c b/src/sys/pioctl.c index 9260c06..1df62ad 100644 --- a/src/sys/pioctl.c +++ b/src/sys/pioctl.c @@ -48,6 +48,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, -- 1.9.4