Merge "Fix derefrencing of NULL pointer" into tizen

[platform/upstream/connman.git] / src / timeserver.c

diff --git a/src/timeserver.c b/src/timeserver.c
old mode 100644 (file)
new mode 100755 (executable)
index 9832c2a..ac99f76
--- a/src/timeserver.c
+++ b/src/timeserver.c
@@ -100,6 +100,17 @@ static void resolv_result(GResolvResultStatus status, char **results,
 {
        int i;
 
+#if defined TIZEN_EXT
+       gchar *server = NULL;
+
+       server = g_strdup((gchar *)user_data);
+       ts_list = g_slist_append(ts_list, server);
+
+       if (!simplified_log)
+               DBG("added server %s", server);
+
+       if (!simplified_log)
+#endif
        DBG("status %d", status);
 
        if (status == G_RESOLV_RESULT_STATUS_SUCCESS) {
@@ -176,10 +187,17 @@ static void sync_next(void)
                        __connman_ntp_start(ts_current, ntp_callback, NULL);
                        return;
                }
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
                DBG("Resolving timeserver %s", ts_current);
+#if defined TIZEN_EXT
+               resolv_id = g_resolv_lookup_hostname(resolv, ts_current,
+                                               resolv_result, ts_current);
+#else
                resolv_id = g_resolv_lookup_hostname(resolv, ts_current,
                                                resolv_result, NULL);
+#endif
                return;
        }
 
@@ -345,8 +363,10 @@ int __connman_timeserver_sync(struct connman_service *default_service)
        if (!service)
                return -EINVAL;
 
+#if !defined TIZEN_EXT
        if (service == ts_service)
                return -EALREADY;
+#endif
 
        if (!resolv)
                return 0;