From 6024581217557c12a4d28f710fc7c2cffe0d1b42 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sun, 5 Nov 2000 03:25:14 +0000 Subject: [PATCH] eliminate-libaudit-requirement-20001104 move afsconf_CheckAuth which requires afsconf_SuperUser into userok.c where afsconf_SuperUser is, eliminating the need for libaudit when using archive libraries (doesn't help with shlibs) --- src/auth/authcon.c | 10 ---------- src/auth/userok.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/auth/authcon.c b/src/auth/authcon.c index 9772a43644..ac8d81e1b3 100644 --- a/src/auth/authcon.c +++ b/src/auth/authcon.c @@ -74,16 +74,6 @@ extern struct rx_securityClass *rxkad_NewClientSecurityObject(); #endif /* defined(UKERNEL) */ -#if !defined(UKERNEL) -int afsconf_CheckAuth(adir, acall) -register struct rx_call *acall; -register struct afsconf_dir *adir; { - LOCK_GLOBAL_MUTEX - return ((afsconf_SuperUser(adir, acall, (char *)0) == 0)? 10029 : 0); - UNLOCK_GLOBAL_MUTEX -} -#endif /* !defined(UKERNEL) */ - /* return a null security object if nothing else can be done */ static afs_int32 QuickAuth(astr, aindex) struct rx_securityClass **astr; diff --git a/src/auth/userok.c b/src/auth/userok.c index 0eef7708e9..33a5a8a1ad 100644 --- a/src/auth/userok.c +++ b/src/auth/userok.c @@ -52,6 +52,16 @@ #include "afs/audit.h" +#if !defined(UKERNEL) +int afsconf_CheckAuth(adir, acall) +register struct rx_call *acall; +register struct afsconf_dir *adir; { + LOCK_GLOBAL_MUTEX + return ((afsconf_SuperUser(adir, acall, (char *)0) == 0)? 10029 : 0); + UNLOCK_GLOBAL_MUTEX +} +#endif /* !defined(UKERNEL) */ + static GetNoAuthFlag(adir) struct afsconf_dir *adir; { if (access(AFSDIR_SERVER_NOAUTH_FILEPATH, 0) == 0) {