Fix bandb's interaction with --enable-fhs-paths by storing ban.db in the correct...

diff --git a/bandb/rsdb_sqlite3.c b/bandb/rsdb_sqlite3.c
index bcdb1eb9bc310d668d89c5875ac58b4994e77efe..bec35fb77b3e5cbbe80385953797f9ef896e3361 100644 (file)
--- a/bandb/rsdb_sqlite3.c
+++ b/bandb/rsdb_sqlite3.c
@@ -57,19 +57,19 @@ mlog(const char *errstr, ...)
 int
 rsdb_init(rsdb_error_cb * ecb)
 {
-       const char *bandb_dpath;
+       const char *bandb_dbpath_env;
        char dbpath[PATH_MAX];
        char errbuf[128];
        error_cb = ecb;
 
        /* try a path from the environment first, useful for basedir overrides */
-       bandb_dpath = getenv("BANDB_DPATH");
+       bandb_dbpath_env = getenv("BANDB_DBPATH");
 
-       if(bandb_dpath != NULL)
-               rb_snprintf(dbpath, sizeof(dbpath), "%s/etc/ban.db", bandb_dpath);
+       if(bandb_dbpath_env != NULL)
+               rb_strlcpy(dbpath, bandb_dbpath_env, sizeof(dbpath));
        else
                rb_strlcpy(dbpath, DBPATH, sizeof(dbpath));
-       
+
        if(sqlite3_open(dbpath, &rb_bandb) != SQLITE_OK)
        {
                rb_snprintf(errbuf, sizeof(errbuf), "Unable to open sqlite database: %s",

diff --git a/src/bandbi.c b/src/bandbi.c
index 5c9933e26b483e28374eec3c6828037ba785c973..e861b98ecfc5ea1eba7d70aa0e02da9ca58e7b9d 100644 (file)
--- a/src/bandbi.c
+++ b/src/bandbi.c
@@ -82,7 +82,7 @@ start_bandb(void)
        const char *suffix = "";
 #endif
 
-       rb_setenv("BANDB_DPATH", ConfigFileEntry.dpath, 1);
+       rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
        if(bandb_path == NULL)
        {
                rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);