all listeners must have a 'transport' section

diff --git a/raddb/sites-available/detail b/raddb/sites-available/detail
index d417355172b054313ef2b913326d02ff088ed12a..76f170ee86060d0bbeffad7f5b8dfec95ee13b13 100644 (file)
--- a/raddb/sites-available/detail
+++ b/raddb/sites-available/detail
@@ -27,10 +27,16 @@ server detail {
        #  says "load the detail file processor, and not the typical
        #  RADIUS UDP / TCP socket IO.
        #
-       listen detail {
+       listen detail {         
                #
-               #  Overrides the default transport prefix set by
-               #  namespace and loads the detail reader code.
+               #  We read from files
+               #
+               transport = file
+
+               #
+               #  A special-case over-ride for detail files.  We are in the
+               #  RADIUS namespace, but we load a special handler for the detail
+               #  file
                #
                proto = detail
 

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 968522a51b34a63a3f270505c1d7a528c7460076..887c8b536554ede8721b452a00ecce0e60206315 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -444,10 +444,10 @@ static int listen_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF_IT
         *      modules.  Create a unique name for them.
         */
        cp = cf_pair_find(listener_cs, "transport");
-       if (cp && cf_pair_value(cp)) {
-               transport = cf_pair_value(cp);
-       } else {
-               transport = "generic";
+       if (!cp ||
+           (transport = cf_pair_value(cp)) == NULL) {
+               cf_log_err(listener_cs, "Invalid 'listen' section - No 'transport = ...' definition was found.");
+               return -1;
        }
 
        /*

diff --git a/src/tests/auth/unit_test_module.conf b/src/tests/auth/unit_test_module.conf
index 45ed337771d65cdb196caca5b983a5d7cd6b9f35..af87c4a633582c609e92f5e16d2c2e8c47313cac 100644 (file)
--- a/src/tests/auth/unit_test_module.conf
+++ b/src/tests/auth/unit_test_module.conf
@@ -26,10 +26,6 @@ modules {
 server default {
        namespace = radius
 
-       listen {
-               type = Access-Request
-       }
-
        recv Access-Request {
                control.Password.Cleartext := 'hello'
 

diff --git a/src/tests/bin/dhcpv4.conf b/src/tests/bin/dhcpv4.conf
index b8accaa8d25ca9a79bc622876bbd8864128874f6..ed23f213c5133de438241b99407b12243f9b138f 100644 (file)
--- a/src/tests/bin/dhcpv4.conf
+++ b/src/tests/bin/dhcpv4.conf
@@ -10,11 +10,6 @@ modules {
 server default {
        namespace = dhcpv4
 
-       listen {
-               type = Discover
-               type = Request
-       }
-
        recv Discover {
                ok
        }

diff --git a/src/tests/bin/unit_test_module.conf b/src/tests/bin/unit_test_module.conf
index 7b1626b330ad0195c4e74eae7dc95c36dd7b1b9a..b010c5a530629292dedc4b59c9c350a6693fc030 100644 (file)
--- a/src/tests/bin/unit_test_module.conf
+++ b/src/tests/bin/unit_test_module.conf
@@ -10,11 +10,6 @@ modules {
 server default {
        namespace = radius
 
-       listen {
-               type = Access-Request
-               type = CoA-Request
-       }
-
        recv Access-Request {
                control.Auth-Type := ::accept
        }

diff --git a/src/tests/detail/config/radiusd.conf b/src/tests/detail/config/radiusd.conf
index a59c04950eb1864f5114093baa33121e44c6a9d9..a2c66275965dcc2931996152d8638868091319c5 100644 (file)
--- a/src/tests/detail/config/radiusd.conf
+++ b/src/tests/detail/config/radiusd.conf
@@ -67,6 +67,8 @@ server default {
        listen detail {
                type = Accounting-Request
 
+               transport = file
+
                proto = detail
 
                exit_when_done = yes

diff --git a/src/tests/keywords/dhcpv4.conf b/src/tests/keywords/dhcpv4.conf
index 73b1353966f3b1fc476cdb9e0922561828432e9e..253a59ff792af6e862edbb7816f0e53293c13973 100644 (file)
--- a/src/tests/keywords/dhcpv4.conf
+++ b/src/tests/keywords/dhcpv4.conf
@@ -28,10 +28,6 @@ $INCLUDE policy.conf
 server default {
        namespace = dhcpv4
 
-       listen {
-               type = Discover
-       }
-
        recv Discover {
                #
                #  Include the test file specified by the

diff --git a/src/tests/keywords/dhcpv6.conf b/src/tests/keywords/dhcpv6.conf
index 080dda85b5a105f92d0bfab78e8ff50140aeb324..97edd98922102aeef91f88ec5ae765300c362956 100644 (file)
--- a/src/tests/keywords/dhcpv6.conf
+++ b/src/tests/keywords/dhcpv6.conf
@@ -28,10 +28,6 @@ $INCLUDE policy.conf
 server default {
        namespace = dhcpv6
 
-       listen {
-               type = Solicit
-       }
-
        recv Solicit {
                #
                #  Include the test file specified by the

diff --git a/src/tests/keywords/radius.conf b/src/tests/keywords/radius.conf
index 02902ff2e40665575d5aa9dcd23b8ef497848c2b..bb3e5103a3bc43563a5a02c41102ed3e1a0e7a0a 100644 (file)
--- a/src/tests/keywords/radius.conf
+++ b/src/tests/keywords/radius.conf
@@ -131,10 +131,6 @@ $INCLUDE policy.conf
 server default {
        namespace = radius
 
-       listen {
-               type = Access-Request
-       }
-
        dictionary {
                tlv my-tlv {
                        uint32 a
@@ -179,10 +175,6 @@ server default {
 server second {
        namespace = radius
 
-       listen {
-               type = Access-Request
-       }
-
        recv Access-Request {
                reply.Reply-Message := "call second"
 

diff --git a/src/tests/modules/unit_test_module.conf b/src/tests/modules/unit_test_module.conf
index 64503f4410b354840dfa27a694064c0bbcf9c152..1aede855ba61179d5b82de1c7de1d0b26e0c9505 100644 (file)
--- a/src/tests/modules/unit_test_module.conf
+++ b/src/tests/modules/unit_test_module.conf
@@ -39,10 +39,6 @@ $-INCLUDE $ENV{MODULE_TEST_DIR}/clients.conf
 server default {
        namespace = radius
 
-       listen {
-               type = Access-Request
-       }
-
        recv Access-Request {
                #
                # Include the test file specified by the

diff --git a/src/tests/process/dhcpv4/server.conf b/src/tests/process/dhcpv4/server.conf
index 493c76aba94cfb0bb15a0bca76d3480745102306..ae385c175c1c5fdaaa2dfc07865e9365d2e7f507 100644 (file)
--- a/src/tests/process/dhcpv4/server.conf
+++ b/src/tests/process/dhcpv4/server.conf
@@ -41,11 +41,6 @@ modules {
 server dhcpv4 {
        namespace = dhcpv4
 
-       listen {
-               type = Discover
-               type = Request
-       }
-
        recv Discover {
                reply += {
                        Hardware-Type = Ethernet

diff --git a/src/tests/process/dhcpv6/server.conf b/src/tests/process/dhcpv6/server.conf
index 597092d9823f5e6844fe3130acf63eaa4e33f644..1e00d9d16e430fc955b2b60838227ffd356a0c36 100644 (file)
--- a/src/tests/process/dhcpv6/server.conf
+++ b/src/tests/process/dhcpv6/server.conf
@@ -38,12 +38,6 @@ policy {
 server dhcpv6 {
        namespace = dhcpv6
 
-       listen local_network {
-               type = Request
-               type = Solicit
-               type = Information-Request
-       }
-
        dhcpv6 {
 #              status_code_on_success = no
 #              send_failure_message = no

diff --git a/src/tests/xlat/unit_test_module.conf b/src/tests/xlat/unit_test_module.conf
index 03bd37fda18a75bf7755b1498ee23da7d5401903..256d6e4e3acd492607f15dda21c4de82aa55277e 100644 (file)
--- a/src/tests/xlat/unit_test_module.conf
+++ b/src/tests/xlat/unit_test_module.conf
@@ -22,12 +22,6 @@ modules {
 server default {
        namespace = radius
 
-       listen {
-               # no transport means no transport...
-               type = Access-Request
-
-       }
-
        recv Access-Request {
                &control.Password.Cleartext := 'hello'