Merge tag 'upstream/1.40' into tizen.

[platform/upstream/connman.git] / plugins / loopback.c

diff --git a/plugins/loopback.c b/plugins/loopback.c
index 28a59c9..3809d8f 100755 (executable)
--- a/plugins/loopback.c
+++ b/plugins/loopback.c
@@ -48,16 +48,6 @@ static in_addr_t loopback_netmask;
 
 static char system_hostname[HOST_NAME_MAX + 1];
 
-static void create_hostname(void)
-{
-       const char *name = "localhost";
-
-       if (sethostname(name, strlen(name)) < 0)
-               connman_error("Failed to set hostname to %s", name);
-
-       strncpy(system_hostname, name, HOST_NAME_MAX);
-}
-
 #if defined TIZEN_EXT
 static void _create_hostname(void)
 {
@@ -90,6 +80,17 @@ static void _create_hostname(void)
        g_free(dev_id);
        fclose(fp);
 }
+#else
+static void create_hostname(void)
+{
+       const char *name = "localhost";
+
+       if (sethostname(name, strlen(name)) < 0)
+               connman_error("Failed to set hostname to %s", name);
+
+       strncpy(system_hostname, name, HOST_NAME_MAX);
+}
+
 #endif
 
 static int setup_hostname(void)
@@ -102,6 +103,7 @@ static int setup_hostname(void)
                connman_error("Failed to get current hostname");
                return -EIO;
        }
+
 #if defined TIZEN_EXT
        if (strlen(system_hostname) > 0 &&
                        strcmp(system_hostname, "(none)") != 0 &&