summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-01-08 10:55:02 +0000
committerOlivier Blin <oblin@mandriva.com>2009-01-08 10:55:02 +0000
commit874ce7d69b32a443cb08a61c0562e3da8bfc36d9 (patch)
treedb758d6e47bb37a9835a91e24db3d7c5cabdf98a
parent3c5d1872306a4a3c6b026cd09a8d8cc6fed3dddd (diff)
downloaddrakx-874ce7d69b32a443cb08a61c0562e3da8bfc36d9.tar
drakx-874ce7d69b32a443cb08a61c0562e3da8bfc36d9.tar.gz
drakx-874ce7d69b32a443cb08a61c0562e3da8bfc36d9.tar.bz2
drakx-874ce7d69b32a443cb08a61c0562e3da8bfc36d9.tar.xz
drakx-874ce7d69b32a443cb08a61c0562e3da8bfc36d9.zip
lookup for Samba master browsers too (backport from trunk)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/remote/smb.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e871ae963..3a1c3d5de 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o lookup for Samba master browsers too
+
Version 10.29.11 - 30 September 2008
- libDrakX:
diff --git a/perl-install/fs/remote/smb.pm b/perl-install/fs/remote/smb.pm
index 7757eeb3f..1399d2f62 100644
--- a/perl-install/fs/remote/smb.pm
+++ b/perl-install/fs/remote/smb.pm
@@ -53,7 +53,7 @@ sub smbclient {
}
sub find_servers {
- my (undef, @l) = `nmblookup "*"`;
+ my (undef, @l) = `nmblookup "*"; nmblookup -M -- -`;
s/\s.*\n// foreach @l;
require network::network;
my @servers = grep { network::network::is_ip($_) } @l;