Fix bandb's interaction with --enable-fhs-paths by storing ban.db in the correct directory, pkglocalstatedir.
This commit is contained in:
parent
c74836dc4a
commit
96b8a6edce
2 changed files with 6 additions and 6 deletions
|
@ -58,16 +58,16 @@ mlog(const char *errstr, ...)
|
||||||
int
|
int
|
||||||
rsdb_init(rsdb_error_cb * ecb)
|
rsdb_init(rsdb_error_cb * ecb)
|
||||||
{
|
{
|
||||||
const char *bandb_dpath;
|
const char *bandb_dbpath_env;
|
||||||
char dbpath[PATH_MAX];
|
char dbpath[PATH_MAX];
|
||||||
char errbuf[128];
|
char errbuf[128];
|
||||||
error_cb = ecb;
|
error_cb = ecb;
|
||||||
|
|
||||||
/* try a path from the environment first, useful for basedir overrides */
|
/* 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)
|
if(bandb_dbpath_env != NULL)
|
||||||
rb_snprintf(dbpath, sizeof(dbpath), "%s/etc/ban.db", bandb_dpath);
|
rb_strlcpy(dbpath, bandb_dbpath_env, sizeof(dbpath));
|
||||||
else
|
else
|
||||||
rb_strlcpy(dbpath, DBPATH, sizeof(dbpath));
|
rb_strlcpy(dbpath, DBPATH, sizeof(dbpath));
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ start_bandb(void)
|
||||||
const char *suffix = "";
|
const char *suffix = "";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
rb_setenv("BANDB_DPATH", ConfigFileEntry.dpath, 1);
|
rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
|
||||||
if(bandb_path == NULL)
|
if(bandb_path == NULL)
|
||||||
{
|
{
|
||||||
rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);
|
rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);
|
||||||
|
|
Loading…
Reference in a new issue