aboutsummaryrefslogtreecommitdiffstats
path: root/modules/es_unix
diff options
context:
space:
mode:
authorlloyd <[email protected]>2007-10-19 13:41:10 +0000
committerlloyd <[email protected]>2007-10-19 13:41:10 +0000
commit0c89766c853fd766b4dac7cc4ac22a5db8e10fe4 (patch)
tree56adbf8b5f99ac3aa3a719111cac8e8eff077aea /modules/es_unix
parent15c4cb75243aaf70dadf5c2a8f76332f0a24a7d5 (diff)
Don't hard code any directories to search for programs into es_unix.
All are now specified through the config. The new default is just /bin, /sbin, /usr/bin, and /usr/sbin. Formerly /usr/ucb, /usr/etc, and /etc were also searched. If you want this behavior again you have to explicitly set the rng/unix_path configuration setting.
Diffstat (limited to 'modules/es_unix')
-rw-r--r--modules/es_unix/es_unix.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/es_unix/es_unix.cpp b/modules/es_unix/es_unix.cpp
index cb2ded840..d534db2ab 100644
--- a/modules/es_unix/es_unix.cpp
+++ b/modules/es_unix/es_unix.cpp
@@ -86,12 +86,7 @@ void Unix_EntropySource::do_slow_poll()
const u32bit TRY_TO_GET = 16 * 1024;
const u32bit MINIMAL_WORKING = 32;
- const std::string BASE_PATH = "/bin:/sbin:/usr/bin:/usr/sbin";
- const std::string EXTRA_PATH = global_config().option("rng/unix_path");
-
- std::string PATH = BASE_PATH;
- if(EXTRA_PATH != "")
- PATH += ':' + EXTRA_PATH;
+ const std::string PATH = global_config().option("rng/unix_path");
u32bit got = 0;
for(u32bit j = 0; j != sources.size(); j++)