From 7685c082c8ac5e01bef287b831ef13ec307119c1 Mon Sep 17 00:00:00 2001 From: Michael Graff Date: Sat, 17 Jun 2000 01:42:21 +0000 Subject: [PATCH] remove flags from source types. It was never used, and probably shouldn't be there. --- bin/dnssec/dnssectool.c | 4 ++-- bin/named/server.c | 2 +- bin/tests/dst/dst_test.c | 4 ++-- bin/tests/dst/t_dst.c | 8 ++++---- bin/tests/entropy_test.c | 8 +++----- bin/tests/tkey_test.c | 2 +- lib/isc/include/isc/entropy.h | 3 +-- lib/isc/unix/entropy.c | 7 +------ 8 files changed, 15 insertions(+), 23 deletions(-) diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 60dc274811..cef0043b30 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -174,11 +174,11 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { if (result != ISC_R_SUCCESS) fatal("could not create entropy object"); if (randomfile != NULL) { - result = isc_entropy_createfilesource(*ectx, randomfile, 0); + result = isc_entropy_createfilesource(*ectx, randomfile); if (result == ISC_R_SUCCESS) return; } - result = isc_entropy_createfilesource(*ectx, "/dev/random", 0); + result = isc_entropy_createfilesource(*ectx, "/dev/random"); if (result != ISC_R_SUCCESS) fatal("No randomfile specified, and /dev/random not present."); return; diff --git a/bin/named/server.c b/bin/named/server.c index eb40068004..df5d1bf64e 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -1556,7 +1556,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { server->entropy = NULL; CHECKFATAL(isc_entropy_create(ns_g_mctx, &server->entropy), "initializing entropy pool"); - (void) isc_entropy_createfilesource(server->entropy, "/dev/random", 0); + (void)isc_entropy_createfilesource(server->entropy, "/dev/random"); CHECKFATAL(dst_lib_init(ns_g_mctx, server->entropy, 0), "initializing DST"); diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c index 2c80d98d87..08119b9d76 100644 --- a/bin/tests/dst/dst_test.c +++ b/bin/tests/dst/dst_test.c @@ -241,8 +241,8 @@ main(void) { dns_result_register(); isc_entropy_create(mctx, &ectx); - isc_entropy_createfilesource(ectx, "/dev/random", 0); - isc_entropy_createfilesource(ectx, "randomfile", 0); + isc_entropy_createfilesource(ectx, "/dev/random"); + isc_entropy_createfilesource(ectx, "randomfile"); dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY); dns_fixedname_init(&fname); diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c index 72d3854aad..12f98ef200 100644 --- a/bin/tests/dst/t_dst.c +++ b/bin/tests/dst/t_dst.c @@ -366,8 +366,8 @@ t1(void) { t_result(T_UNRESOLVED); return; } - isc_entropy_createfilesource(ectx, "/dev/random", 0); - result = isc_entropy_createfilesource(ectx, "randomfile", 0); + isc_entropy_createfilesource(ectx, "/dev/random"); + result = isc_entropy_createfilesource(ectx, "randomfile"); if (isc_result != ISC_R_SUCCESS) { t_info("isc_entropy_create failed %d\n", isc_result_totext(isc_result)); @@ -840,8 +840,8 @@ t2_vfy(char **av) { isc_result_totext(isc_result)); return(T_UNRESOLVED); } - isc_entropy_createfilesource(ectx, "/dev/random", 0); - result = isc_entropy_createfilesource(ectx, "randomfile", 0); + isc_entropy_createfilesource(ectx, "/dev/random"); + result = isc_entropy_createfilesource(ectx, "randomfile"); if (isc_result != ISC_R_SUCCESS) { t_info("isc_entropy_create failed %d\n", isc_result_totext(isc_result)); diff --git a/bin/tests/entropy_test.c b/bin/tests/entropy_test.c index 3c6380e6d6..0ff77add06 100644 --- a/bin/tests/entropy_test.c +++ b/bin/tests/entropy_test.c @@ -71,15 +71,13 @@ main(int argc, char **argv) { isc_entropy_stats(ent, stderr); #if 1 - flags = 0; CHECK("isc_entropy_createfilesource() 1", - isc_entropy_createfilesource(ent, "/dev/random", flags)); + isc_entropy_createfilesource(ent, "/dev/random")); CHECK("isc_entropy_createfilesource() 2", - isc_entropy_createfilesource(ent, "/dev/random", flags)); + isc_entropy_createfilesource(ent, "/dev/random")); #else - flags = 0; CHECK("isc_entropy_createfilesource() 3", - isc_entropy_createfilesource(ent, "/tmp/foo", flags)); + isc_entropy_createfilesource(ent, "/tmp/foo")); #endif fprintf(stderr, diff --git a/bin/tests/tkey_test.c b/bin/tests/tkey_test.c index bd15e7e260..490195794f 100644 --- a/bin/tests/tkey_test.c +++ b/bin/tests/tkey_test.c @@ -372,7 +372,7 @@ main(int argc, char *argv[]) { ectx = NULL; RUNTIME_CHECK(isc_entropy_create(mctx, &ectx) == ISC_R_SUCCESS); - result = isc_entropy_createfilesource(ectx, "/dev/random", 0); + result = isc_entropy_createfilesource(ectx, "/dev/random"); if (result != ISC_R_SUCCESS) { fprintf(stderr, "%s only runs when /dev/random is available.\n", diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h index e8b6edb431..f59654260e 100644 --- a/lib/isc/include/isc/entropy.h +++ b/lib/isc/include/isc/entropy.h @@ -136,8 +136,7 @@ isc_entropy_detach(isc_entropy_t **entp); */ isc_result_t -isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname, - unsigned int flags); +isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname); /* * Create a new entropy source from a file. * diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c index 8816cfff26..8e6ce8999f 100644 --- a/lib/isc/unix/entropy.c +++ b/lib/isc/unix/entropy.c @@ -119,7 +119,6 @@ struct isc_entropysource { isc_uint32_t magic; unsigned int type; isc_entropy_t *ent; - unsigned int flags; /* flags */ isc_uint32_t total; /* entropy from this source */ ISC_LINK(isc_entropysource_t) link; char name[32]; @@ -854,9 +853,7 @@ make_nonblock(int fd) { } isc_result_t -isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname, - unsigned int flags) -{ +isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) { int fd; isc_result_t ret; isc_entropysource_t *source; @@ -894,7 +891,6 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname, source->magic = SOURCE_MAGIC; source->type = ENTROPY_SOURCETYPE_FILE; source->ent = ent; - source->flags = flags; source->total = 0; memset(source->name, 0, sizeof(source->name)); ISC_LINK_INIT(source, link); @@ -988,7 +984,6 @@ isc_entropy_createcallbacksource(isc_entropy_t *ent, source->magic = SOURCE_MAGIC; source->type = ENTROPY_SOURCETYPE_CALLBACK; source->ent = ent; - source->flags = 0; source->total = 0; memset(source->name, 0, sizeof(source->name)); ISC_LINK_INIT(source, link);