mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix parse_time GMT computation for daylight savings time

Browse Source
This commit is contained in:
Howard Chu 2004-04-04 13:40:56 +00:00
parent 2387d2aff8
commit ebd7bc27e7
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
servers/slapd/overlays/ppolicy.c
View File

@ -52,8 +52,6 @@ typedef struct pw_conn {
static pw_conn *pwcons; static pw_conn *pwcons;
static long gmtoff; /* Offset of local time from GMT */
typedef struct pass_policy { typedef struct pass_policy {
AttributeDescription *ad; /* attribute to which the policy applies */ AttributeDescription *ad; /* attribute to which the policy applies */
int pwdMinAge; /* minimum time (seconds) until passwd can change */ int pwdMinAge; /* minimum time (seconds) until passwd can change */
@ -196,7 +194,8 @@ static ldap_pvt_thread_mutex_t chk_syntax_mutex;
static time_t static time_t
parse_time( char *atm ) parse_time( char *atm )
{ {
struct tm tm; struct tm tml, tmg;
time_t t;
if (!atm) return (time_t)-1; if (!atm) return (time_t)-1;
@ -210,9 +209,27 @@ parse_time( char *atm )
* else parse the time and return it's time_t value. This will be -1 if the * else parse the time and return it's time_t value. This will be -1 if the
* text isn't a valid time string. * text isn't a valid time string.
*/ */
strptime( atm, "%Y%m%d%H%M%SZ", &tm ); strptime( atm, "%Y%m%d%H%M%SZ", &tml );
tm.tm_isdst = 0; tml.tm_isdst = -1;
return mktime(&tm) - gmtoff; t = mktime( &tml );
if ( t == (time_t)-1 ) return t;
/* mktime() assumes localtime. Compute the offset to GMT.
*/
ldap_pvt_thread_mutex_lock( &gmtime_mutex );
tmg = *gmtime( &t );
ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
tmg.tm_mday -= tml.tm_mday;
tmg.tm_hour -= tml.tm_hour;
if ( tmg.tm_mday ) tmg.tm_hour += tmg.tm_mday > 0 ? 24 : -24;
if ( tmg.tm_hour ) t -= tmg.tm_hour * 3600;
tmg.tm_min -= tml.tm_min;
if ( tmg.tm_min ) t -= tmg.tm_min * 60;
tmg.tm_sec -= tml.tm_sec;
if ( tmg.tm_sec ) t -= tmg.tm_sec;
return t;
} }
static int static int
@ -1838,23 +1855,6 @@ int ppolicy_init()
return code; return code;
} }
/* Find out our offset from GMT since mktime() always assumes
* its input is local time
*/
{
time_t gmt, lcl, now = slap_get_time();
struct tm *tmp;
tmp = gmtime( &now );
gmt = mktime( tmp );
tmp = localtime( &now );
tmp->tm_isdst = 0;
lcl = mktime( tmp );
gmtoff = gmt - lcl;
}
ldap_pvt_thread_mutex_init( &chk_syntax_mutex ); ldap_pvt_thread_mutex_init( &chk_syntax_mutex );
ppolicy.on_bi.bi_type = "ppolicy"; ppolicy.on_bi.bi_type = "ppolicy";