Merge branch 'v4_1' of ssh://vc.netcitadel.com:2222/var/git/fwbuilder into v4_1

build_num

@@ -1 +1 @@
-#define BUILD_NUM 3405
+#define BUILD_NUM 3406

doc/ChangeLog

@@ -1,3 +1,8 @@
+2010-11-02  Vadim Kurland  <vadim@vk.crocodile.org>
+
+	* OSConfigurator_linux24_interfaces.cpp (printVerifyInterfacesCommands):
+	fixed #1824 "should not try to verify wildcard interfaces".
+
 2010-11-01  Vadim Kurland  <vadim@netcitadel.com>
 
 	* CompilerDriver.cpp (CompilerDriver::getAbsOutputFileName): fixed

src/iptlib/OSConfigurator_linux24_interfaces.cpp

@@ -81,7 +81,10 @@ string OSConfigurator_linux24::printVerifyInterfacesCommands()
     for (i=interfaces.begin(); i!=interfaces.end(); ++i )
     {
         QString iface_name = (*i)->getName().c_str();
-        if (interfaces_to_check.indexOf(iface_name) == -1)
+/* if interface name ends with '*', this is a wildcard interface. Do
+ * not check if it exists.
+ */
+        if (!iface_name.contains("*") && interfaces_to_check.indexOf(iface_name) == -1)
         {
             interfaces_to_check.push_back((*i)->getName().c_str());
         }

src/res/configlets/linux24/run_time_wrappers

@@ -30,9 +30,9 @@ done
 getinterfaces {{$interface_family_name}} | while read I; do
     ivar=$(getInterfaceVarName $I)
     getaddr{{if ipv6}}6{{endif}} $I $ivar
-    ## cmd="$"$ivar
-    ## eval "addr=$cmd"
-    for addr in ${ivar}_list
+    cmd="$"${ivar}_list
+    eval "addr_list=$cmd"
+    for addr in $addr_list
     do
         test -n "$addr" && {{$command}}
     done