]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Remove dead code from the mechglue initialization
authorGünther Deschner <gdeschner@redhat.com>
Wed, 5 Mar 2014 15:21:55 +0000 (16:21 +0100)
committerGreg Hudson <ghudson@mit.edu>
Thu, 22 May 2014 21:54:09 +0000 (17:54 -0400)
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]

src/lib/gssapi/mechglue/g_initialize.c

index 48a825e3bb70f5514dbbae4493f0c761aedb8bd0..c6904e0a45e9a2a1c257eef2ef192c4ee760d74b 100644 (file)
@@ -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;
 
@@ -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. */
@@ -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;
 
@@ -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();
 
        /*