mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
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. (This used to be commit 58cf23f4da2b36f173fcb6a695ff6798be5c589b)
This commit is contained in:
parent
e8e866867e
commit
9d4f9bda32
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
Loading…
x
Reference in New Issue
Block a user