Remove internal Samba shre mounting code, this had some privilege esc…

…alation issues, and is not well tested
CDrummond · Jun 15, 2018 · afc4f83 · afc4f83
1 parent ce78cdb
commit afc4f83
Show file tree

Hide file tree

Showing 38 changed files with 45 additions and 2,034 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(cantata)
 
-#  NOTE: If PROJECT_URL, or PROJECT_REV_URL, are changed, then cantata-dynamic, and README will need updating.
-#        dbus/mpd.cantata.xml and devices/mounter/mpd.cantata.mounter.xml will also need renaming/updating.
+#  NOTE: If PROJECT_URL, or PROJECT_REV_URL, are changed, then cantata-dynamic, README, and
+#        dbus/mpd.cantata.xml will need renaming/updating.
 set(PROJECT_URL "cantata.mpd")
 set(PROJECT_REV_URL "mpd.cantata")
 
@@ -408,9 +408,6 @@ if (TAGLIB_FOUND)
     if (ENABLE_DEVICES_SUPPORT)
         set(CANTATA_LIBS ${CANTATA_LIBS} solidlite)
     endif ()
-    if (ENABLE_DEVICES_SUPPORT AND ENABLE_REMOTE_DEVICES AND NOT WIN32 AND NOT APPLE)
-        set(CANTATA_LIBS ${CANTATA_LIBS} avahi)
-    endif ()
 
     if (FFMPEG_FOUND OR MPG123_FOUND)
         set(CANTATA_SRCS ${CANTATA_SRCS} replaygain/albumscanner.cpp replaygain/rgdialog.cpp replaygain/tagreader.cpp replaygain/jobcontroller.cpp)
@@ -465,9 +462,6 @@ if (TAGLIB_FOUND)
             set(CANTATA_SRCS ${CANTATA_SRCS} devices/remotefsdevice.cpp devices/remotedevicepropertiesdialog.cpp
                 devices/remotedevicepropertieswidget.cpp)
             set(CANTATA_UIS ${CANTATA_UIS} devices/remotedevicepropertieswidget.ui)
-            qt5_add_dbus_interfaces(CANTATA_SRCS devices/mounter/${PROJECT_REV_URL}.mounter.xml)
-            add_subdirectory(devices/mounter)
-            add_subdirectory(devices/avahi)
         endif ()
     else (ENABLE_DEVICES_SUPPORT)
         set(CANTATA_SRCS ${CANTATA_SRCS} devices/device.cpp)

diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,8 @@
 2. When using Track Organizer to rename music tracks, rename any other files
    that have the same basename as the music file.
 3. Install cantata.png to use as Windows tray icon.
+4. Remove internal Samba shre mounting code, this had some privilege
+   escalation issues, and is not well tested.
 
 2.3.1
 -----

diff --git a/devices/avahi/CMakeLists.txt b/devices/avahi/CMakeLists.txt
diff --git a/devices/avahi/avahi.cpp b/devices/avahi/avahi.cpp
diff --git a/devices/avahi/avahi.h b/devices/avahi/avahi.h
diff --git a/devices/avahi/avahiservice.cpp b/devices/avahi/avahiservice.cpp
diff --git a/devices/avahi/avahiservice.h b/devices/avahi/avahiservice.h