Changeset 142

Timestamp:

05/16/06 12:53:53 (3 years ago)

Author:

ludo

Message:

v0.9.4: try net lookup before nmblookup (from r3423)

Files:

• trunk/webmin/lbs-vnc/debian/changelog (modified) (1 diff)
• trunk/webmin/lbs-vnc/index.cgi (modified) (2 diffs)
• trunk/webmin/lbs-vnc/module.info (modified) (1 diff)

trunk/webmin/lbs-vnc/debian/changelog

@@ -1 @@
-3
+4
-
-  * New release.

trunk/webmin/lbs-vnc/index.cgi

@@ -119 +119 @@
-  }
-
+  # and net lookup 
+  $ret = exec("sh -c \"/usr/bin/net cache flush;/usr/bin/net lookup host ".escapeshellcmd($name)." 2>&1\"");
+  preg_match("/^(\d+\.\d+\.\d+\.\d+)/", $ret, $match);
+  $ip = $match[1]; 
+  if ($ip != "") {
+      scanRunVNC($ip, $type, $ssh);     
+      $ips .= " ".$ip;
+  }
+
-  # and nmblookup 
-  $ret = exec("/usr/bin/nmblookup $name 2>&1");
@@ -128 +137 @@
-  }
-
-  # and net lookup 
-  $ret = exec("/usr/bin/net lookup host $name 2>&1");
-  preg_match("/^(\d+\.\d+\.\d+\.\d+)/", $ret, $match);
-  $ip = $match[1]; 
-  if ($ip != "") {
-      scanRunVNC($ip, $type, $ssh);     
-      $ips .= " ".$ip;
-  }
-  
-  # Last try: find info from OCS Inventory

trunk/webmin/lbs-vnc/module.info

@@ -3 +3 @@
-desc_fr=LRS : Prise de Contrôle à Distance
-depends=0.94 lbs_common
-3
+4