Had some environment problem to test the fix, so it would be really appreciated if packagers would be able to test their findsmb utility.

This fix is to make findsmb aware that the space a valid NetBIOS name character and to not get only the first part of the name as the NetBIOS name if it contains spaces.

Simo.

7 files changed, 18 insertions, 14 deletions

diff --git a/packaging/Caldera/OpenLinux/findsmb b/packaging/Caldera/OpenLinux/findsmb
index 986c2481779..f70d18dcbdc 100755
--- a/packaging/Caldera/OpenLinux/findsmb
+++ b/packaging/Caldera/OpenLinux/findsmb
@@ -73,7 +73,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +103,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/Caldera/OpenServer/findsmb b/packaging/Caldera/OpenServer/findsmb
index bb91c784b89..c87fdb5190a 100755
--- a/packaging/Caldera/OpenServer/findsmb
+++ b/packaging/Caldera/OpenServer/findsmb
@@ -73,7 +73,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +103,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/Caldera/UnixWare/findsmb b/packaging/Caldera/UnixWare/findsmb
index bb91c784b89..c87fdb5190a 100755
--- a/packaging/Caldera/UnixWare/findsmb
+++ b/packaging/Caldera/UnixWare/findsmb
@@ -73,7 +73,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +103,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/Mandrake/findsmb b/packaging/Mandrake/findsmb
index 986c2481779..f70d18dcbdc 100755
--- a/packaging/Mandrake/findsmb
+++ b/packaging/Mandrake/findsmb
@@ -73,7 +73,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +103,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/PHT/TurboLinux/findsmb b/packaging/PHT/TurboLinux/findsmb
index 986c2481779..f70d18dcbdc 100755
--- a/packaging/PHT/TurboLinux/findsmb
+++ b/packaging/PHT/TurboLinux/findsmb
@@ -73,7 +73,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +103,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/RedHat/findsmb b/packaging/RedHat/findsmb
index 986c2481779..04bc6080508 100755
--- a/packaging/RedHat/findsmb
+++ b/packaging/RedHat/findsmb
@@ -73,7 +73,10 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+# The Netbios name can contain lot of characters also '<' '>'
+# and spaces. The follwing cure inside name space but not
+# names starting or ending with spaces
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +106,8 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+# Same as before for space and characters
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/SGI/findsmb b/packaging/SGI/findsmb
index a48ec592e80..336ff07c16f 100755
--- a/packaging/SGI/findsmb
+++ b/packaging/SGI/findsmb
@@ -73,7 +73,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +103,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";