Desactivation du changement de chaine en --novlan

diff --git a/src/input/input_vlan.c b/src/input/input_vlan.c
index bc8ee9b112529d065b5b86d21c6b67d022e8b005..26170b399a039a03195510e2840def56e13fabdb 100644 (file)
--- a/src/input/input_vlan.c
+++ b/src/input/input_vlan.c
@@ -134,8 +134,6 @@ static int ZeTrucMucheFunction( int Channel)
        struct sockaddr_in      sa_client;
         char mess[80];
 
-       return( 0 );
-        
        /*      
         *Looking for informations about the eth0 interface
         */

diff --git a/src/interface/interface.c b/src/interface/interface.c
index b276ef299012e64e084c0f486697710741ce6e9f..6397511546c953ce5b740a56b1d1d86f73168847 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -140,6 +140,13 @@ void intf_Destroy( intf_thread_t *p_intf )
 int intf_SelectInput( intf_thread_t * p_intf, int i_index )
 {
     intf_DbgMsg("\n");
+
+    /* If VLANs are not active, return with an error */
+    if( !p_main->b_vlans )
+    {
+        intf_ErrMsg("error: VLANs are not activated\n");
+        return( 1 );        
+    }    
     
     /* Kill existing input, if any */
     if( p_intf->p_input != NULL )