Signed-off-by: William Whitehead <william.whitehead@lexisnexis.com>

system/security/LdapSecurity/ldapconnection.cpp

@@ -891,7 +891,7 @@ private:
     StringBuffer         m_pwscheme;
     bool                 m_domainPwdsNeverExpire;//no domain policy for password expiration
     __int64              m_maxPwdAge;
-    time_t               lastPwdAgeCheck;
+    time_t               m_lastPwdAgeCheck;
 
     class CLDAPMessage
     {
@@ -914,7 +914,7 @@ public:
         else
             m_connections.setown(new CLdapConnectionPool(m_ldapconfig.get()));  
         m_pp = NULL;
-        lastPwdAgeCheck = 0;
+        m_lastPwdAgeCheck = 0;
         //m_defaultFileScopePermission = -2;
         //m_defaultWorkunitScopePermission = -2;
     }
@@ -966,7 +966,7 @@ public:
 
     virtual __int64 getMaxPwdAge()
     {
-        if ((msTick() - lastPwdAgeCheck) < (60*1000))
+        if ((msTick() - m_lastPwdAgeCheck) < (60*1000))
             return m_maxPwdAge;
         char* attrs[] = {"maxPwdAge", NULL};
         CLDAPMessage searchResult;
@@ -987,7 +987,7 @@ public:
             return 0;
         }
         char **values;
-        __int64 maxAge = 0;
+        m_maxPwdAge = 0;
         values = ldap_get_values(sys_ld, searchResult.msg, "maxPwdAge");
         if (values && *values)
         {
@@ -995,13 +995,13 @@ public:
             if (*val == '-')
                 ++val;
             for (int x=0; val[x]; x++)
-                maxAge = maxAge * 10 + ( (int)val[x] - '0');
+                m_maxPwdAge = m_maxPwdAge * 10 + ( (int)val[x] - '0');
         }
         else
-            maxAge = PWD_NEVER_EXPIRES;
+            m_maxPwdAge = PWD_NEVER_EXPIRES;
         ldap_value_free(values);
-        lastPwdAgeCheck = msTick();
-        return maxAge;
+        m_lastPwdAgeCheck = msTick();
+        return m_maxPwdAge;
     }
 
     void calcPWExpiry(CDateTime &dt, unsigned len, char * val)
@@ -1027,7 +1027,7 @@ public:
             if(!username || !*username || !password || !*password)
                 return false;
 
-            m_maxPwdAge = getMaxPwdAge();
+            getMaxPwdAge();//sets m_maxPwdAge
             if (m_maxPwdAge != PWD_NEVER_EXPIRES)
                 m_domainPwdsNeverExpire = false;
             else