From: Simon Wilkinson Date: Mon, 13 Sep 2010 07:54:55 +0000 (+0100) Subject: userok: Don't double check for expiry X-Git-Tag: upstream/1.8.0_pre1^2~4805 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=10bb4b31038c967ce5f9dd2f0e54ffd7bfe18daf;p=packages%2Fo%2Fopenafs.git userok: Don't double check for expiry rxkad_GetServerInfo returns an error if you attempt to get server information using a connection whose tokens have already expired. The additional check for expiry in the userOK routines is therefore not required - they'll never be reached, because GetServerInfo will already have errored out. Change-Id: I7b1a97249d40b12a2aae4009971a9b676700870e Reviewed-on: http://gerrit.openafs.org/2753 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/auth/userok.c b/src/auth/userok.c index 54d1f0c29..28e715a2b 100644 --- a/src/auth/userok.c +++ b/src/auth/userok.c @@ -466,14 +466,6 @@ rxkadSuperUser(struct afsconf_dir *adir, struct rx_call *acall, char *namep) if (code) return 0; /* bogus connection/other error */ - /* don't bother checking anything else if tix have expired */ -#ifdef AFS_PTHREAD_ENV - if (exp < clock_Sec()) -#else - if (exp < FT_ApproxTime()) -#endif - return 0; /* expired tix */ - return kerberosSuperUser(adir, tname, tinst, tcell, namep); }