Fix buildsystem to point to bin not main

diff --git a/.gitignore b/.gitignore
index b78d12149172b728385262d5dfe92320079a11ae..91b274efb138fbdffb00c2b774491604731bc922 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,7 @@ autom4te.cache
 config.guess
 config.sub
 config.h
-src/main/unit_test_attribute
+src/bin/unit_test_attribute
 src/modules/lib/
 warnings.txt
 

diff --git a/configure b/configure
index 07d0569e1b648f3cbaf9feffab8d1a92f281b473..a2e7ef5b402f2f9b8feefd7befd4457660f06d87 100755 (executable)
--- a/configure
+++ b/configure
@@ -585,7 +585,7 @@ PACKAGE_STRING='freeradius $Id$'
 PACKAGE_BUGREPORT='http://bugs.freeradius.org'
 PACKAGE_URL='http://www.freeradius.org'
 
-ac_unique_file="src/main/radiusd.c"
+ac_unique_file="src/bin/radiusd.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -15055,7 +15055,7 @@ ac_config_commands="$ac_config_commands scripts-chmod"
 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/radsniff.mk ./src/main/checkrad ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/radrelay.conf ./raddb/radiusd.conf"
+ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/bin/radsniff.mk ./src/bin/checkrad ./src/bin/radlast ./src/bin/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/radrelay.conf ./raddb/radiusd.conf"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15759,10 +15759,10 @@ do
     "scripts-chmod") CONFIG_COMMANDS="$CONFIG_COMMANDS scripts-chmod" ;;
     "./Make.inc") CONFIG_FILES="$CONFIG_FILES ./Make.inc" ;;
     "./src/include/build-radpaths-h") CONFIG_FILES="$CONFIG_FILES ./src/include/build-radpaths-h" ;;
-    "./src/main/radsniff.mk") CONFIG_FILES="$CONFIG_FILES ./src/main/radsniff.mk" ;;
-    "./src/main/checkrad") CONFIG_FILES="$CONFIG_FILES ./src/main/checkrad" ;;
-    "./src/main/radlast") CONFIG_FILES="$CONFIG_FILES ./src/main/radlast" ;;
-    "./src/main/radtest") CONFIG_FILES="$CONFIG_FILES ./src/main/radtest" ;;
+    "./src/bin/radsniff.mk") CONFIG_FILES="$CONFIG_FILES ./src/bin/radsniff.mk" ;;
+    "./src/bin/checkrad") CONFIG_FILES="$CONFIG_FILES ./src/bin/checkrad" ;;
+    "./src/bin/radlast") CONFIG_FILES="$CONFIG_FILES ./src/bin/radlast" ;;
+    "./src/bin/radtest") CONFIG_FILES="$CONFIG_FILES ./src/bin/radtest" ;;
     "./scripts/rc.radiusd") CONFIG_FILES="$CONFIG_FILES ./scripts/rc.radiusd" ;;
     "./scripts/cron/radiusd.cron.daily") CONFIG_FILES="$CONFIG_FILES ./scripts/cron/radiusd.cron.daily" ;;
     "./scripts/cron/radiusd.cron.monthly") CONFIG_FILES="$CONFIG_FILES ./scripts/cron/radiusd.cron.monthly" ;;
@@ -16321,7 +16321,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   case $ac_file$ac_mode in
     "stamp-h":C) echo timestamp > src/include/stamp-h ;;
     "build-radpaths-h":C) (cd ./src/include && /bin/sh ./build-radpaths-h) ;;
-    "main-chmod":C) (cd ./src/main && chmod +x checkrad radlast radtest) ;;
+    "main-chmod":C) (cd ./src/bin && chmod +x checkrad radlast radtest) ;;
     "scripts-chmod":C) (cd ./scripts && chmod +x rc.radiusd cron/radiusd.cron.daily cron/radiusd.cron.monthly cryptpasswd) ;;
 
   esac

diff --git a/configure.ac b/configure.ac
index d7fcfd080fcaa6cb9670724b90e4d3823b5189df..2324136b6d216955c2869c6e7eea35fc4e72983c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.59])
 export CFLAGS LIBS LDFLAGS CPPFLAGS
 
 AC_INIT([freeradius],[$]Id[$],[http://bugs.freeradius.org],,[http://www.freeradius.org])
-AC_CONFIG_SRCDIR([src/main/radiusd.c])
+AC_CONFIG_SRCDIR([src/bin/radiusd.c])
 AC_CONFIG_HEADER([src/include/autoconf.h])
 m4_include([m4/ax_cc.m4])
 m4_include([m4/ax_with_lib_args.m4])
@@ -2286,7 +2286,7 @@ dnl #
 dnl #############################################################
 AC_CONFIG_COMMANDS([stamp-h], [echo timestamp > src/include/stamp-h])
 AC_CONFIG_COMMANDS([build-radpaths-h], [(cd ./src/include && /bin/sh ./build-radpaths-h)])
-AC_CONFIG_COMMANDS([main-chmod], [(cd ./src/main && chmod +x checkrad radlast radtest)])
+AC_CONFIG_COMMANDS([main-chmod], [(cd ./src/bin && chmod +x checkrad radlast radtest)])
 AC_CONFIG_COMMANDS([scripts-chmod], [(cd ./scripts && chmod +x rc.radiusd cron/radiusd.cron.daily cron/radiusd.cron.monthly cryptpasswd)])
 
 dnl #
@@ -2298,10 +2298,10 @@ AC_SUBST(INSTALLSTRIP)
 AC_OUTPUT(\
   ./Make.inc \
   ./src/include/build-radpaths-h \
-  ./src/main/radsniff.mk \
-  ./src/main/checkrad \
-  ./src/main/radlast \
-  ./src/main/radtest \
+  ./src/bin/radsniff.mk \
+  ./src/bin/checkrad \
+  ./src/bin/radlast \
+  ./src/bin/radtest \
   ./scripts/rc.radiusd \
   ./scripts/cron/radiusd.cron.daily \
   ./scripts/cron/radiusd.cron.monthly \

diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff
index a1ce4fa0b6de7993fc704af3a2241144768e276b..a41ea3c5d8a9ae94af38e7b6a6cbaba266e52afc 100644 (file)
--- a/debian/patches/radiusd-to-freeradius.diff
+++ b/debian/patches/radiusd-to-freeradius.diff
@@ -57,8 +57,8 @@
  
        #
        #  Access mode.
---- a/src/main/radiusd.c
-+++ b/src/main/radiusd.c
+--- a/src/bin/radiusd.c
++++ b/src/bin/radiusd.c
 @@ -126,12 +126,11 @@ int main(int argc, char *argv[])
        main_config.daemonize = true;
        main_config.spawn_workers = true;

diff --git a/doc/README.md b/doc/README.md
index ea346ccc4d5eda8e6efd80e60acc1c3a93c9d9f1..c463f1fd2f5932e5f1a5c8ddd2eb774029c9e837 100644 (file)
--- a/doc/README.md
+++ b/doc/README.md
@@ -76,10 +76,11 @@ Please do not raise general configuration issues there.
 | Directory                    | Description
 |---                           |---
 | ``src/``                     | Source code
-| ``src/main/``                        | Source code for the daemon and associated utilities.
-| ``src/lib/``                 | Source code for the RADIUS library.
+| ``src/bin/``                 | Source code for the daemon and associated utilities.
+| ``src/lib/``                 | Source code for various utility libraries.
 | ``src/include/``             | Header files.
-| ``src/modules/``             | Dynamic plug-in modules.
+| ``src/protocols/``           | Dynamic frontend plug-in modules.
+| ``src/modules/``             | Dynamic backend plug-in modules.
 
 # Debugging
 

diff --git a/doc/deployment/CYGWIN.rst b/doc/deployment/CYGWIN.rst
index da61d49b2da4389d3839b0a07d13d6bb3cecff88..2ccfef0e537431f0eed60e6b6cdb63041e3bad75 100644 (file)
--- a/doc/deployment/CYGWIN.rst
+++ b/doc/deployment/CYGWIN.rst
@@ -222,7 +222,7 @@ Configuring FreeRADIUS for EAP under CygWin.
 
    ::
 
-    src/main/Makefile.in
+    src/bin/Makefile.in
 
     145,148c145,148
     <       $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP)

diff --git a/src/bin/all.mk b/src/bin/all.mk
index 42bfa3a91c381d3bd0ea92acf739d0a3bad3dee9..d00721781a4987c7c024122d93bca1f1c95dfd89 100644 (file)
--- a/src/bin/all.mk
+++ b/src/bin/all.mk
@@ -12,4 +12,4 @@ SUBMAKEFILES := \
     unit_test_map.mk \
     unit_test_module.mk \
     checkrad.mk \
-    $(wildcard ${top_builddir}/src/main/*_ext/all.mk)
+    $(wildcard ${top_builddir}/src/bin/*_ext/all.mk)

diff --git a/src/bin/checkrad.mk b/src/bin/checkrad.mk
index e991bf74bcc9a7348f17fae042dccaca090db1ae..081b3fccb132f4271e62b9d0a253d90e807523a0 100644 (file)
--- a/src/bin/checkrad.mk
+++ b/src/bin/checkrad.mk
@@ -1,5 +1,5 @@
 install: $(R)$(sbindir)/checkrad
 
-$(R)$(sbindir)/checkrad: src/main/checkrad | $(R)$(sbindir)
+$(R)$(sbindir)/checkrad: src/bin/checkrad | $(R)$(sbindir)
        @echo INSTALL $(notdir $<)
        @$(INSTALL) -m 755 $< $(R)$(sbindir)

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 00109f132cdf18bc5a984ee1123f264c7ab7f637..0a3a3d35233761a09c7af7c4e9fc131d538e60cc 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -17,7 +17,7 @@
 /**
  * $Id$
  *
- * @file main/radclient.c
+ * @file src/bin/radclient.c
  * @brief General radius client and debug tool.
  *
  * @copyright 2000,2006,2014  The FreeRADIUS server project

diff --git a/src/bin/radlast.mk b/src/bin/radlast.mk
index 766ce1feb75bca67951e750e7c82134e9a9058e9..21a6124677a42ac1a0e2d2ec036a2326079d355f 100644 (file)
--- a/src/bin/radlast.mk
+++ b/src/bin/radlast.mk
@@ -1,5 +1,5 @@
 install: $(R)$(bindir)/radlast
 
-$(R)$(bindir)/radlast: src/main/radlast | $(R)$(bindir)
+$(R)$(bindir)/radlast: src/bin/radlast | $(R)$(bindir)
        @echo INSTALL $(notdir $<)
        @$(INSTALL) -m 755 $< $(R)$(bindir)

diff --git a/src/bin/radmin.c b/src/bin/radmin.c
index 0c5f12488c1fdcdcf8a6ccb21229769d1458c197..4e34a9c41e87eadb909d1c8b86367ca18786fffd 100644 (file)
--- a/src/bin/radmin.c
+++ b/src/bin/radmin.c
@@ -17,7 +17,7 @@
 /**
  * $Id$
  *
- * @file src/main/radmin.c
+ * @file src/bin/radmin.c
  * @brief Internal implementation of radmin
  *
  * @copyright 2018 The FreeRADIUS server project

diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index 09a4ecd055c51778bb55b2c6480cf4813b6595e0..688c026f79d213b878229fd46903d2ca9faf4c69 100644 (file)
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -17,8 +17,8 @@
 /*
  * $Id$
  *
- * @brief map / template functions
- * @file main/radsnmp.c
+ * @brief SNMP to request utility
+ * @file src/bin/radsnmp.c
  *
  * @copyright 2015-2016 The FreeRADIUS server project
  * @copyright 2015-2016 Network RADIUS SARL <info@networkradius.com>

diff --git a/src/bin/radtest.mk b/src/bin/radtest.mk
index 3adc1332d1c11aef1be49802a0c4b96fe43b4c2c..48de0473faa360dc9291e8ebc8184cf81d21a7ec 100644 (file)
--- a/src/bin/radtest.mk
+++ b/src/bin/radtest.mk
@@ -1,5 +1,5 @@
 install: $(R)$(bindir)/radtest
 
-$(R)$(bindir)/radtest: src/main/radtest | $(R)$(bindir)
+$(R)$(bindir)/radtest: src/bin/radtest | $(R)$(bindir)
        @echo INSTALL $(notdir $<)
        @$(INSTALL) -m 755 $< $(R)$(bindir)

diff --git a/src/bin/radzap.mk b/src/bin/radzap.mk
index bd0eb6d48dca340c4faace30657571a0b85fad9a..f64db2165b0000b0e39e8547b29abfa67612e05b 100644 (file)
--- a/src/bin/radzap.mk
+++ b/src/bin/radzap.mk
@@ -1,5 +1,5 @@
 install: $(R)$(bindir)/radzap
 
-$(R)$(bindir)/radzap: src/main/radzap | $(R)$(bindir)
+$(R)$(bindir)/radzap: src/bin/radzap | $(R)$(bindir)
        @echo INSTALL $(notdir $<)
        @$(INSTALL) -m 755 $< $(R)$(bindir)