[sr-dev] git:5.3:0b6283dc: db2_local: replace timelocal() with mktime()

Daniel-Constantin Mierla miconda at gmail.com
Fri May 1 20:55:22 CEST 2020


Module: kamailio
Branch: 5.3
Commit: 0b6283dc6006c8817664dd915057442500e0dae8
URL: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442500e0dae8

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-05-01T09:53:53+02:00

db2_local: replace timelocal() with mktime()

- timelocal() is nonstandard GNU extension, not recommended to be used
and mktime() should be equivalent:
  * https://linux.die.net/man/3/timegm
- GH #2298

(cherry picked from commit a0fb220a8b60b135cabf6741882437317116d868)

---

Modified: src/modules/db2_ldap/ld_fld.c

---

Diff:  https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442500e0dae8.diff
Patch: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442500e0dae8.patch

---

diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c
index 867c873e8f..7af731f077 100644
--- a/src/modules/db2_ldap/ld_fld.c
+++ b/src/modules/db2_ldap/ld_fld.c
@@ -270,7 +270,7 @@ static inline int ldap_gentime2db_datetime(time_t* dst, str* src)
 		 * of expiration by one hour when daylight saving is used
 		 */
 		time.tm_isdst = -1;
-		*dst = timelocal(&time);
+		*dst = mktime(&time);
 	}
 	
 	return 0;




More information about the sr-dev mailing list