Merge "Error checking in passphrase decryption method." into tizen

diff --git a/configure.ac b/configure.ac
index 2a039f0..791e2a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -298,8 +298,8 @@ PKG_CHECK_MODULES(LIBNL_GENL, libnl-genl-3.0, dummy=yes,
 AC_SUBST(LIBNL_GENL_CFLAGS)
 AC_SUBST(LIBNL_GENL_LIBS)
 
-PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd-daemon, dummy=yes,
-                               AC_MSG_ERROR(libsystemd-daemon library is required))
+PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd, dummy=yes,
+                               AC_MSG_ERROR(libsystemd library is required))
 AC_SUBST(LIBSYSTEMD_CFLAGS)
 AC_SUBST(LIBSYSTEMD_LIBS)
 

diff --git a/packaging/connman.spec b/packaging/connman.spec
index aa1cfbb..501c10e 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -22,7 +22,7 @@ BuildRequires:  pkgconfig(xtables)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(libnl-3.0)
 BuildRequires:  pkgconfig(libnl-genl-3.0)
-BuildRequires:  pkgconfig(libsystemd-daemon)
+BuildRequires:  pkgconfig(libsystemd)
 %if %{with connman_openconnect}
 BuildRequires:  openconnect
 %endif

diff --git a/plugins/wifi.c b/plugins/wifi.c
index f80cbd1..2c6d50d 100755 (executable)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2408,7 +2408,7 @@ static void setup_autoscan(struct wifi_data *wifi)
 
                return;
        }
-#endif
+#else
 
        /*
         * On the contrary, if BackgroundScanning is disabled, update autoscan
@@ -2432,6 +2432,7 @@ static void setup_autoscan(struct wifi_data *wifi)
                wifi->autoscan = parse_autoscan_params(AUTOSCAN_SINGLE);
                break;
        }
+#endif
 }
 
 static void finalize_interface_creation(struct wifi_data *wifi)

diff --git a/src/technology.c b/src/technology.c
index 39b0cfa..440d7eb 100644 (file)
--- a/src/technology.c
+++ b/src/technology.c
@@ -1406,9 +1406,10 @@ void __connman_technology_scan_stopped(struct connman_device *device,
        reply_scan_pending_device(technology, ifname, count);
 
        return;
-#endif
+#else
        if (count == 0)
                reply_scan_pending(technology, 0);
+#endif
 }
 
 void __connman_technology_notify_regdom_by_device(struct connman_device *device,