diff options
| author | Werner Koch <[email protected]> | 2015-04-10 11:05:38 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-04-10 11:09:58 +0000 |
| commit | 0fb224c2c5e0c6770d4a6044d62d84f6bbc1b26b (patch) | |
| tree | e425b3e5ee76fe6cef0295c14ccb15d623a6eb48 | |
| parent | common: Add new function gnupg_gmtime. (diff) | |
| download | gnupg-0fb224c2c5e0c6770d4a6044d62d84f6bbc1b26b.tar.gz gnupg-0fb224c2c5e0c6770d4a6044d62d84f6bbc1b26b.zip | |
dirmngr,w32: Replace functions not available under Windows.
* dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
gmtime_r.
| -rw-r--r-- | dirmngr/ks-engine-ldap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c index 82d6234d8..aefd12a1b 100644 --- a/dirmngr/ks-engine-ldap.c +++ b/dirmngr/ks-engine-ldap.c @@ -1748,12 +1748,13 @@ extract_attributes (LDAPMod ***modlist, char *line) Check that first and then if it fails, then try parse_timestamp. */ - if (strptime (create_time, "%Y-%m-%d", &tm)) + if (!isodate_human_to_tm (create_time, &tm)) create_time = tm2ldaptime (&tm); else if ((t = parse_timestamp (create_time, &end)) != (time_t) -1 && *end == '\0') { - if (! gmtime_r (&t, &tm)) + + if (!gnupg_gmtime (&t, &tm)) create_time = NULL; else create_time = tm2ldaptime (&tm); @@ -1795,12 +1796,12 @@ extract_attributes (LDAPMod ***modlist, char *line) Check that first and then if it fails, then try parse_timestamp. */ - if (strptime (expire_time, "%Y-%m-%d", &tm)) + if (!isodate_human_to_tm (expire_time, &tm)) expire_time = tm2ldaptime (&tm); else if ((t = parse_timestamp (expire_time, &end)) != (time_t) -1 && *end == '\0') { - if (! gmtime_r (&t, &tm)) + if (!gnupg_gmtime (&t, &tm)) expire_time = NULL; else expire_time = tm2ldaptime (&tm); |