Skip to content

GitLab

Commit 529ff4b4 authored by Brian Wellington's avatar Brian Wellington
Browse files

HAVE_RANDOMDEV -> PATH_RANDOMDEV

parent c528dee3
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
acconfig.h
View file @ 529ff4b4
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: acconfig.h,v 1.26 2000/08/17 18:56:38 bwelling Exp $ */
/* $Id: acconfig.h,v 1.27 2000/08/17 19:17:44 bwelling Exp $ */
/***
*** This file is not to be included by any public header files, because
......@@ -104,4 +104,4 @@ int sigwait(const unsigned int *set, int *sig);
#endif /* SHUTUP_STDARG_CAST && __GNUC__ */
/* define if the system has a random number generating device */
#undef HAVE_RANDOMDEV
#undef PATH_RANDOMDEV
bin/dnssec/dnssectool.c
View file @ 529ff4b4
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssectool.c,v 1.19 2000/08/17 18:56:44 bwelling Exp $ */
/* $Id: dnssectool.c,v 1.20 2000/08/17 19:17:57 bwelling Exp $ */
#include <config.h>
......@@ -258,10 +258,10 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
isc_result_totext(result));
}
else {
#ifdef HAVE_RANDOMDEV
#ifdef PATH_RANDOMDEV
if (randomfile == NULL) {
result = isc_entropy_createfilesource(*ectx,
HAVE_RANDOMDEV);
PATH_RANDOMDEV);
if (result == ISC_R_SUCCESS)
return;
}
......
bin/named/main.c
View file @ 529ff4b4
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.80 2000/08/17 18:56:45 bwelling Exp $ */
/* $Id: main.c,v 1.81 2000/08/17 19:17:51 bwelling Exp $ */
#include <config.h>
......@@ -425,8 +425,8 @@ create_managers(void) {
return (ISC_R_UNEXPECTED);
}
#ifdef HAVE_RANDOMDEV
(void)isc_entropy_createfilesource(ns_g_entropy, HAVE_RANDOMDEV);
#ifdef PATH_RANDOMDEV
(void)isc_entropy_createfilesource(ns_g_entropy, PATH_RANDOMDEV);
#endif
return (ISC_R_SUCCESS);
......
bin/tests/dst/dst_test.c
View file @ 529ff4b4
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dst_test.c,v 1.31 2000/08/17 18:56:48 bwelling Exp $ */
/* $Id: dst_test.c,v 1.32 2000/08/17 19:17:53 bwelling Exp $ */
#include <config.h>
......@@ -243,8 +243,8 @@ main(void) {
dns_result_register();
isc_entropy_create(mctx, &ectx);
#ifdef HAVE_RANDOMDEV
isc_entropy_createfilesource(ectx, HAVE_RANDOMDEV);
#ifdef PATH_RANDOMDEV
isc_entropy_createfilesource(ectx, PATH_RANDOMDEV);
#endif
isc_entropy_createfilesource(ectx, "randomfile");
dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY);
......
bin/tests/dst/t_dst.c
View file @ 529ff4b4
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: t_dst.c,v 1.37 2000/08/17 18:56:49 bwelling Exp $ */
/* $Id: t_dst.c,v 1.38 2000/08/17 19:17:54 bwelling Exp $ */
#include <config.h>
......@@ -370,8 +370,8 @@ t1(void) {
t_result(T_UNRESOLVED);
return;
}
#ifdef HAVE_RANDOMDEV
isc_entropy_createfilesource(ectx, HAVE_RANDOMDEV);
#ifdef PATH_RANDOMDEV
isc_entropy_createfilesource(ectx, PATH_RANDOMDEV);
#endif
result = isc_entropy_createfilesource(ectx, "randomfile");
if (isc_result != ISC_R_SUCCESS) {
......@@ -846,8 +846,8 @@ t2_vfy(char **av) {
isc_result_totext(isc_result));
return(T_UNRESOLVED);
}
#ifdef HAVE_RANDOMDEV
isc_entropy_createfilesource(ectx, HAVE_RANDOMDEV);
#ifdef PATH_RANDOMDEV
isc_entropy_createfilesource(ectx, PATH_RANDOMDEV);
#endif
result = isc_entropy_createfilesource(ectx, "randomfile");
if (isc_result != ISC_R_SUCCESS) {
......
bin/tests/tkey_test.c
View file @ 529ff4b4
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: tkey_test.c,v 1.30 2000/08/17 18:56:46 bwelling Exp $ */
/* $Id: tkey_test.c,v 1.31 2000/08/17 19:17:55 bwelling Exp $ */
/*
* Principal Author: Brian Wellington (core copied from res_test.c)
......@@ -375,8 +375,8 @@ main(int argc, char *argv[]) {
ectx = NULL;
RUNTIME_CHECK(isc_entropy_create(mctx, &ectx) == ISC_R_SUCCESS);
#ifdef HAVE_RANDOMDEV
result = isc_entropy_createfilesource(ectx, HAVE_RANDOMDEV);
#ifdef PATH_RANDOMDEV
result = isc_entropy_createfilesource(ectx, PATH_RANDOMDEV);
#else
result = ISC_R_NOTFOUND;
#endif
......
config.h.in
View file @ 529ff4b4
......@@ -16,7 +16,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.h.in,v 1.35 2000/08/17 18:56:39 bwelling Exp $ */
/* $Id: config.h.in,v 1.36 2000/08/17 19:17:47 bwelling Exp $ */
/***
*** This file is not to be included by any public header files, because
......@@ -115,7 +115,7 @@ int sigwait(const unsigned int *set, int *sig);
#endif /* SHUTUP_STDARG_CAST && __GNUC__ */
/* define if the system has a random number generating device */
#undef HAVE_RANDOMDEV
#undef PATH_RANDOMDEV
/* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
......
configure
View file @ 529ff4b4
......@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# From configure.in Revision: 1.176
# From configure.in Revision: 1.177
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
## Copyright (C) 1996-1999 Free Software Foundation, Inc.
......@@ -1291,14 +1291,14 @@ case "$use_randomdev" in
case "$host" in
*-openbsd*)
cat >> confdefs.h <<\EOF
#define HAVE_RANDOMDEV "/dev/srandom"
#define PATH_RANDOMDEV "/dev/srandom"
EOF
echo "$ac_t""using /dev/srandom" 1>&6
;;
*-linux*|*-freebsd*|*-netbsd*)
cat >> confdefs.h <<\EOF
#define HAVE_RANDOMDEV "/dev/random"
#define PATH_RANDOMDEV "/dev/random"
EOF
echo "$ac_t""using /dev/random" 1>&6
......@@ -1313,7 +1313,7 @@ EOF
;;
*)
cat >> confdefs.h <<EOF
#define HAVE_RANDOMDEV "$use_randomdev"
#define PATH_RANDOMDEV "$use_randomdev"
EOF
echo "$ac_t""using "$use_randomdev"" 1>&6
......
configure.in
View file @ 529ff4b4
......@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.177 $)
AC_REVISION($Revision: 1.178 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.13)
......@@ -271,11 +271,11 @@ case "$use_randomdev" in
unspec)
case "$host" in
*-openbsd*)
AC_DEFINE(HAVE_RANDOMDEV, "/dev/srandom")
AC_DEFINE(PATH_RANDOMDEV, "/dev/srandom")
AC_MSG_RESULT(using /dev/srandom)
;;
*-linux*|*-freebsd*|*-netbsd*)
AC_DEFINE(HAVE_RANDOMDEV, "/dev/random")
AC_DEFINE(PATH_RANDOMDEV, "/dev/random")
AC_MSG_RESULT(using /dev/random)
;;
*)
......@@ -287,7 +287,7 @@ case "$use_randomdev" in
AC_MSG_ERROR([--with-randomdev must specify a path])
;;
*)
AC_DEFINE_UNQUOTED(HAVE_RANDOMDEV, "$use_randomdev")
AC_DEFINE_UNQUOTED(PATH_RANDOMDEV, "$use_randomdev")
AC_MSG_RESULT(using "$use_randomdev")
;;
esac
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment