Removed check-radiusd-config. It's no longer needed.

diff --git a/configure b/configure
index 3a5b713..76d1449 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.257 .
+# From configure.in Revision: 1.258 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -25332,7 +25332,7 @@ USE_STATIC_LIBS=$enable_static
   unset ac_cv_env_LIBS_set
   unset ac_cv_env_LIBS_value
 
-  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/Makefile ./src/main/checkrad.pl ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/radwatch ./scripts/check-radiusd-config ./scripts/radiusd.cron.daily ./scripts/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/dictionary ./raddb/radiusd.conf"
+  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/Makefile ./src/main/checkrad.pl ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/radwatch ./scripts/radiusd.cron.daily ./scripts/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/dictionary ./raddb/radiusd.conf"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -25903,7 +25903,6 @@ do
     "./src/main/radtest") CONFIG_FILES="$CONFIG_FILES ./src/main/radtest" ;;
     "./scripts/rc.radiusd") CONFIG_FILES="$CONFIG_FILES ./scripts/rc.radiusd" ;;
     "./scripts/radwatch") CONFIG_FILES="$CONFIG_FILES ./scripts/radwatch" ;;
-    "./scripts/check-radiusd-config") CONFIG_FILES="$CONFIG_FILES ./scripts/check-radiusd-config" ;;
     "./scripts/radiusd.cron.daily") CONFIG_FILES="$CONFIG_FILES ./scripts/radiusd.cron.daily" ;;
     "./scripts/radiusd.cron.monthly") CONFIG_FILES="$CONFIG_FILES ./scripts/radiusd.cron.monthly" ;;
     "./scripts/cryptpasswd") CONFIG_FILES="$CONFIG_FILES ./scripts/cryptpasswd" ;;

diff --git a/configure.in b/configure.in
index 7a3c147..f934fb9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1178,7 +1178,6 @@ AC_OUTPUT(\
        ./src/main/radtest \
        ./scripts/rc.radiusd \
        ./scripts/radwatch \
-       ./scripts/check-radiusd-config \
        ./scripts/radiusd.cron.daily \
        ./scripts/radiusd.cron.monthly \
        ./scripts/cryptpasswd \

diff --git a/scripts/Makefile b/scripts/Makefile
index dcd3cd8..a057d4f 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -11,6 +11,5 @@ install:
        $(INSTALL) -m 755 rc.radiusd            $(R)$(sbindir)
        $(INSTALL) -m 755 radsqlrelay           $(R)$(bindir)
        $(INSTALL) -m 755 radwatch              $(R)$(sbindir)
-       $(INSTALL) -m 755 check-radiusd-config  $(R)$(sbindir)
 
 clean:

diff --git a/scripts/check-radiusd-config.in b/scripts/check-radiusd-config.in
deleted file mode 100755 (executable)
index 753013d..0000000
--- a/scripts/check-radiusd-config.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-#  Check the RADIUS server configuration files.
-#
-#  If everything is OK, this script exits without an error.
-#
-#  If there was an error parsing the configuration files, this script
-#  prints the errors to the screen, and exits with an error.
-#
-#  This process presumes, of course, that there weren't any DNS
-#  problems causing the server to wait forever on startup.
-#
-#  AUTHOR: Alan DeKok <aland@ox.org>
-#          Wed Apr 12 15:21:51 EDT 2000
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sbindir=@sbindir@
-sysconfdir=@sysconfdir@
-raddbdir=@raddbdir@
-
-if [ "$1" = "-h" ]; then
-    echo
-    echo Usage: check-radiusd-config
-    echo
-    echo  Checks the radius daemon server configuration for errors.
-    exit 0
-fi
-
-#
-#  Run the server as a background process, picking a high port
-#  that (we hope) no one else is using.
-#
-#  Note that you might have to add a '-d raddb' to the command line
-#  options, if your database is somewhere other than /etc/raddb
-#
-$sbindir/radiusd -X -p 32768 > startup.log 2>&1 &
-
-#
-#  Remember what it's process ID was.
-#
-RADIUSD_PID=$!
-
-#
-#  The server will run in the background until it's killed, so
-#  we need another background job to kill it, after it's read
-#  the configuration files, and is (possibly) running in debug mode.
-#
-(sleep 2 && kill -9 $RADIUSD_PID) > /dev/null 2>&1 &
-
-#
-#  Wait for it to exit with an error (1), or from being killed (137)
-#
-wait $RADIUSD_PID
-RADIUSD_STATUS=$?
-
-#
-#  If the server died with an error, then show the startup error log.
-#
-if test "$RADIUSD_STATUS" = "1"; then
-  cat startup.log
-  exit 1
-fi
-echo Radius server configuration looks OK.
-exit 0