From 025886592e2660803b35054ab6aec293834d65d8 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 31 Mar 2010 01:53:12 +0300 Subject: [PATCH] We dont want to use DB_HOME environment, ever - rpm has its own switches for overriding the db home when that's necessary, DB_HOME it should use not --- lib/backend/db3.c | 2 +- lib/backend/dbconfig.c | 4 ---- macros.in | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/backend/db3.c b/lib/backend/db3.c index 8d5040b..05d8b58 100644 --- a/lib/backend/db3.c +++ b/lib/backend/db3.c @@ -442,7 +442,7 @@ int dbiClose(dbiIndex dbi, unsigned int flags) (dbi->dbi_verbose & DB_VERB_WAITSFOR)); rc = (dbenv->open)(dbenv, dbhome, - DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0); + DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE, 0); rc = cvtdberr(dbi, "dbenv->open", rc, _debug); if (rc) goto exit; diff --git a/lib/backend/dbconfig.c b/lib/backend/dbconfig.c index 6815e43..9a788f9 100644 --- a/lib/backend/dbconfig.c +++ b/lib/backend/dbconfig.c @@ -48,10 +48,6 @@ static const struct poptOption rdbOptions[] = { NULL, NULL }, { "txn_nosync", 0,POPT_BIT_SET, &staticdbi.dbi_eflags, DB_TXN_NOSYNC, NULL, NULL }, - { "use_environ_root", 0,POPT_BIT_SET, &staticdbi.dbi_eflags, DB_USE_ENVIRON_ROOT, - NULL, NULL }, - { "use_environ", 0,POPT_BIT_SET, &staticdbi.dbi_eflags, DB_USE_ENVIRON, - NULL, NULL }, { "lockdown", 0,POPT_BIT_SET, &staticdbi.dbi_eflags, DB_LOCKDOWN, NULL, NULL }, { "private", 0,POPT_BIT_SET, &staticdbi.dbi_eflags, DB_PRIVATE, diff --git a/macros.in b/macros.in index 493694d..db99a76 100644 --- a/macros.in +++ b/macros.in @@ -549,8 +549,6 @@ print (t)\ # lock ??? DB_INIT_LOCK # recover ??? DB_RECOVER # recover_fatal ??? DB_RECOVER_FATAL -# use_environ ??? DB_USE_ENVIRON -# use_environ_root ??? DB_USE_ENVIRON_ROOT # private +++ DB_PRIVATE # lockdown ??? DB_LOCKDOWN # shared +++ DB_SYSTEM_MEM -- 2.7.4