Skip to content

Commit

Permalink
Remove dead code from the mechglue initialization
Browse files Browse the repository at this point in the history
The stat check in gss_indicate_mechs had no consequent and would have
been redundant with logic in updateMechList if it did.

[ghudson@mit.edu: elaborated commit message; removed unused
g_mechSetTime and now-irrelevant comment]
  • Loading branch information
Günther Deschner authored and greghudson committed May 22, 2014
1 parent 44adf12 commit 123c14f
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions src/lib/gssapi/mechglue/g_initialize.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ static gss_mech_info g_mechListTail = NULL;
static k5_mutex_t g_mechListLock = K5_MUTEX_PARTIAL_INITIALIZER;
static time_t g_confFileModTime = (time_t)0;

static time_t g_mechSetTime = (time_t)0;
static gss_OID_set_desc g_mechSet = { 0, NULL };
static k5_mutex_t g_mechSetLock = K5_MUTEX_PARTIAL_INITIALIZER;

Expand Down Expand Up @@ -213,8 +212,6 @@ gss_indicate_mechs(minorStatus, mechSet_out)
OM_uint32 *minorStatus;
gss_OID_set *mechSet_out;
{
char *fileName;
struct stat fileInfo;
OM_uint32 status;

/* Initialize outputs. */
Expand All @@ -233,16 +230,6 @@ gss_OID_set *mechSet_out;
if (*minorStatus != 0)
return (GSS_S_FAILURE);

fileName = MECH_CONF;

/*
* If we have already computed the mechanisms supported and if it
* is still valid; make a copy and return to caller,
* otherwise build it first.
*/
if ((stat(fileName, &fileInfo) == 0 &&
fileInfo.st_mtime > g_mechSetTime)) {
} /* if g_mechSet is out of date or not initialized */
if (build_mechSet())
return GSS_S_FAILURE;

Expand Down Expand Up @@ -289,20 +276,6 @@ build_mechSet(void)
*/
k5_mutex_lock(&g_mechListLock);

#if 0
/*
* this checks for the case when we need to re-construct the
* g_mechSet structure, but the mechanism list is upto date
* (because it has been read by someone calling
* gssint_get_mechanism)
*/
if (fileInfo.st_mtime > g_confFileModTime)
{
g_confFileModTime = fileInfo.st_mtime;
loadConfigFile(fileName);
}
#endif

updateMechList();

/*
Expand Down

0 comments on commit 123c14f

Please sign in to comment.