netatalk: replace gsettings with dconf keyfile for indexer config

The gsettings set approach was broken at runtime because gsettings
requires a dconf-service on the session bus, which netatalk's private
dbus-daemon does not auto-activate.

Replace set_sl_volumes() with a dconf keyfile writer: it creates
/etc/dconf/db/netatalk.d/10-spotlight and runs dconf update, which
works without any session bus. Add DCONF_PROFILE env so the indexer
reads from the netatalk-specific database. Ship config/dconf/netatalk
(system-db:netatalk) as the dconf profile, installed to
sysconfdir/dconf/profile/. Detect the dconf binary at build time and
gate have_spotlight on it instead of gsettings.

Author: rdmark

config/dconf/meson.build

@@ -0,0 +1,5 @@
+install_data(
+    'netatalk',
+    install_dir: sysconfdir / 'dconf/profile',
+    install_tag: 'config',
+)

config/dconf/netatalk

@@ -0,0 +1 @@
+system-db:netatalk

config/meson.build

@@ -11,6 +11,8 @@ else
 endif
 
 if have_spotlight
+    subdir('dconf')
+
     dbus_session_conf = configure_file(
         input: 'dbus-session.conf.in',
         output: 'dbus-session.conf',

etc/netatalk/netatalk.c

@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
+#include <sys/stat.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -99,82 +100,68 @@ static bool service_running(pid_t pid)
 }
 
 #ifdef WITH_SPOTLIGHT
-/*! Set indexers to index all our volumes */
+/*! Set indexers to index all our volumes via a dconf keyfile */
 static int set_sl_volumes(void)
 {
     EC_INIT;
     const struct vol *volumes, *vol;
-    struct bstrList *vollist = bstrListCreate();
+    FILE *fp = NULL;
     int sysret;
-    bstring sep = bfromcstr(", ");
-    bstring volnamelist = NULL, cmd = NULL;
+    bool first;
+
     EC_NULL_LOG(volumes = getvolumes());
 
+    if (mkdir(INDEXER_DCONF_DB_DIR, 0755) != 0 && errno != EEXIST) {
+        LOG(log_error, logtype_sl,
+            "set_sl_volumes: failed to create " INDEXER_DCONF_DB_DIR ": %s",
+            strerror(errno));
+        EC_FAIL;
+    }
+
+    if ((fp = fopen(INDEXER_DCONF_DB_DIR "/10-spotlight", "w")) == NULL) {
+        LOG(log_error, logtype_sl,
+            "set_sl_volumes: failed to open " INDEXER_DCONF_DB_DIR "/10-spotlight: %s",
+            strerror(errno));
+        EC_FAIL;
+    }
+
+    fprintf(fp, "[" INDEXER_DCONF_PATH "]\n");
+    fprintf(fp, "index-recursive-directories=[");
+    first = true;
+
     for (vol = volumes; vol; vol = vol->v_next) {
         if (vol->v_flags & AFPVOL_SPOTLIGHT) {
-            bstring volnamequot = bformat("'%s'", vol->v_path);
-
-            if (vollist->qty == vollist->mlen
-                    && bstrListAlloc(vollist, vollist->qty + 1) != BSTR_OK) {
-                LOG(log_error, logtype_default,
-                    "set_sl_volumes: failed to initialize indexing for %s",
-                    bdata(volnamequot));
+            if (!first) {
+                fprintf(fp, ", ");
             }
-
-            vollist->entry[vollist->qty] = volnamequot;
-            vollist->qty++;
+            fprintf(fp, "'%s'", vol->v_path);
+            first = false;
         }
     }
 
-    volnamelist = bjoin(vollist, sep);
-    cmd = bformat("gsettings set " INDEXER_GSETTINGS_SCHEMA
-                  " index-recursive-directories \"[%s]\"",
-                  bdata(volnamelist) ? bdata(volnamelist) : "");
-    LOG(log_debug, logtype_sl, "set_sl_volumes: %s", bdata(cmd));
-    sysret = system(bdata(cmd));
-
-    if (sysret == -1) {
-        LOG(log_error, logtype_sl, "set_sl_volumes: system() failed to run '%s': %s",
-            bdata(cmd), strerror(errno));
-        EC_FAIL;
-    } else if (sysret != 0) {
-        LOG(log_error, logtype_sl, "set_sl_volumes: command '%s' exited with status %d",
-            bdata(cmd), WEXITSTATUS(sysret));
-        EC_FAIL;
-    }
+    fprintf(fp, "]\n");
+    fprintf(fp, "index-single-directories=@as []\n");
+    fclose(fp);
+    fp = NULL;
 
-    /* Disable default root user home indexing */
-    sysret = system("gsettings set " INDEXER_GSETTINGS_SCHEMA
-                    " index-single-directories \"[]\"");
+    sysret = system("dconf update");
 
     if (sysret == -1) {
         LOG(log_error, logtype_sl,
-            "set_sl_volumes: system() failed to run disable home indexing: %s",
+            "set_sl_volumes: system() failed to run 'dconf update': %s",
             strerror(errno));
         EC_FAIL;
     } else if (sysret != 0) {
         LOG(log_error, logtype_sl,
-            "set_sl_volumes: disable home indexing exited with status %d",
+            "set_sl_volumes: 'dconf update' exited with status %d",
             WEXITSTATUS(sysret));
         EC_FAIL;
     }
 
 EC_CLEANUP:
 
-    if (cmd) {
-        bdestroy(cmd);
-    }
-
-    if (sep) {
-        bdestroy(sep);
-    }
-
-    if (vollist) {
-        bstrListDestroy(vollist);
-    }
-
-    if (volnamelist) {
-        bdestroy(volnamelist);
+    if (fp) {
+        fclose(fp);
     }
 
     EC_EXIT;
@@ -712,6 +699,7 @@ int main(int argc, char **argv)
     if (obj.options.flags & OPTION_SPOTLIGHT) {
         setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "spotlight.ipc",
                1);
+        setenv("DCONF_PROFILE", INDEXER_DCONF_PROFILE, 1);
         setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0);
         setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0);
         setenv("TRACKER_USE_LOG_FILES", "1", 0);

meson.build

@@ -1125,6 +1125,7 @@ if get_option('with-spotlight')
     localsearch = find_program('localsearch', required: false)
     tracker3 = find_program('tracker3', required: false)
     gsettings = find_program('gsettings', required: false)
+    dconf = find_program('dconf', required: false)
 
     localsearch3_schema_found = false
     tracker3_schema_found = false
@@ -1159,6 +1160,10 @@ if get_option('with-spotlight')
             'INDEXER_GSETTINGS_SCHEMA',
             '"org.freedesktop.LocalSearch3.Miner.Files"',
         )
+        cdata.set(
+            'INDEXER_DCONF_PATH',
+            '"org/freedesktop/localsearch3/miner/files"',
+        )
         cdata.set('INDEXER_COMMAND', '"' + indexer.full_path() + ' daemon"')
     elif indexer.found() and tracker3_schema_found
         indexer_found = true
@@ -1167,13 +1172,26 @@ if get_option('with-spotlight')
             'INDEXER_GSETTINGS_SCHEMA',
             '"org.freedesktop.Tracker3.Miner.Files"',
         )
+        cdata.set(
+            'INDEXER_DCONF_PATH',
+            '"org/freedesktop/tracker3/miner/files"',
+        )
         cdata.set('INDEXER_COMMAND', '"' + indexer.full_path() + ' daemon"')
     endif
 
+    cdata.set(
+        'INDEXER_DCONF_DB_DIR',
+        '"' + sysconfdir / 'dconf/db/netatalk.d' + '"',
+    )
+    cdata.set(
+        'INDEXER_DCONF_PROFILE',
+        '"' + sysconfdir / 'dconf/profile/netatalk' + '"',
+    )
+
     have_spotlight = (
         sparql_found
         and indexer_found
-        and gsettings.found()
+        and dconf.found()
         and talloc.found()
         and flex.found()
         and bison.found()

meson_config.h

@@ -406,6 +406,15 @@
 /* Indexer GSettings schema (may differ from D-Bus name) */
 #mesondefine INDEXER_GSETTINGS_SCHEMA
 
+/* Indexer dconf keyfile path (schema with dots replaced by slashes, lowercased) */
+#mesondefine INDEXER_DCONF_PATH
+
+/* Directory for the netatalk dconf database keyfiles */
+#mesondefine INDEXER_DCONF_DB_DIR
+
+/* Path to the netatalk dconf profile file */
+#mesondefine INDEXER_DCONF_PROFILE
+
 /* Define if cracklib should be used */
 #mesondefine USE_CRACKLIB