diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 5a4317a..e0d6fd1 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com") set (PROJECT_LICENSE "GPLv3") set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MINOR 3) -set (PROJECT_VERSION_PATCH 0) +set (PROJECT_VERSION_PATCH 1) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) string (TIMESTAMP CURRENT_YEAR "%Y") diff --git a/sources/helper/netctlgui-helper.service b/sources/helper/netctlgui-helper.service index daa4c0b..171fc76 100644 --- a/sources/helper/netctlgui-helper.service +++ b/sources/helper/netctlgui-helper.service @@ -6,7 +6,6 @@ Documentation=man:netctlgui-helper(1) man:netctl-gui.conf(5) Type=dbus BusName=org.netctlgui.helper ExecStart=/usr/bin/netctlgui-helper --nodaemon --system -Capabilities=CAP_SETUID [Install] WantedBy=multi-user.target diff --git a/sources/helper/src/CMakeLists.txt b/sources/helper/src/CMakeLists.txt index 41180e6..263cd4a 100644 --- a/sources/helper/src/CMakeLists.txt +++ b/sources/helper/src/CMakeLists.txt @@ -55,6 +55,6 @@ add_executable (${SUBPROJECT} ${SOURCES} ${HEADERS} ${MOC_SOURCES} ${QRC_SOURCES target_link_libraries (${SUBPROJECT} ${PROJECT_LIBRARY} ${QT_NEEDED_LIBS}) # install properties install (TARGETS ${SUBPROJECT} DESTINATION bin) -# if (USE_CAPABILITIES) -# install (CODE "exec_program (setcap ARGS \"cap_setuid=ep\" \"$ENV{DESTDIR}/bin/${SUBPROJECT}\")") -# endif () +if (USE_CAPABILITIES) + install (CODE "exec_program (setcap ARGS \"cap_setuid=ep\" \"$ENV{DESTDIR}/bin/${SUBPROJECT}\")") +endif () diff --git a/sources/helper/src/netctlhelper.cpp b/sources/helper/src/netctlhelper.cpp index e905815..1cb7680 100644 --- a/sources/helper/src/netctlhelper.cpp +++ b/sources/helper/src/netctlhelper.cpp @@ -95,21 +95,18 @@ void NetctlHelper::createInterface() if (!sessionBus.registerService(DBUS_HELPER_SERVICE)) { if (debug) qDebug() << PDEBUG << ":" << "Could not register session service"; if (debug) qDebug() << PDEBUG << ":" << sessionBus.lastError().message(); - return quitHelper(); } if (!sessionBus.registerObject(DBUS_LIB_PATH, new NetctlAdaptor(this, debug, configuration), QDBusConnection::ExportAllContents)) { if (debug) qDebug() << PDEBUG << ":" << "Could not register session library object"; if (debug) qDebug() << PDEBUG << ":" << sessionBus.lastError().message(); - return quitHelper(); } if (!sessionBus.registerObject(DBUS_CTRL_PATH, new ControlAdaptor(this, debug, configuration), QDBusConnection::ExportAllContents)) { if (debug) qDebug() << PDEBUG << ":" << "Could not register session control object"; if (debug) qDebug() << PDEBUG << ":" << sessionBus.lastError().message(); - return quitHelper(); } }