summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2009-01-15 13:45:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2009-01-15 13:45:17 +0000
commit6da23babacbaea9be6098df2f7701b3728367608 (patch)
treea642763fb3f2b59f192f89a82c4d433f3cee4cf1
parentec3206ff34636d3039f747b0f086bde450d5c1bf (diff)
downloaddrakx-6da23babacbaea9be6098df2f7701b3728367608.tar
drakx-6da23babacbaea9be6098df2f7701b3728367608.tar.gz
drakx-6da23babacbaea9be6098df2f7701b3728367608.tar.bz2
drakx-6da23babacbaea9be6098df2f7701b3728367608.tar.xz
drakx-6da23babacbaea9be6098df2f7701b3728367608.zip
- diskdrake:
o --smb: fix netbios name resolution (#42483, thanks to Derek Jennings)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/remote/smb.pm4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index dcde41330..cb3450ad9 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o --smb: fix netbios name resolution (#42483, thanks to Derek Jennings)
+
Version 11.77 - 15 January 2008
- diskdrake:
diff --git a/perl-install/fs/remote/smb.pm b/perl-install/fs/remote/smb.pm
index 378aa6a1e..a1b603cf0 100644
--- a/perl-install/fs/remote/smb.pm
+++ b/perl-install/fs/remote/smb.pm
@@ -15,7 +15,7 @@ sub to_fstab_entry {
my $part = $class->to_fstab_entry_raw($e, 'cifs');
if ($e->{server}{username}) {
my ($options, $unknown) = fs::mount_options::unpack($part);
- $options->{"$_="} = $e->{server}{$_} foreach qw(username password domain);
+ $options->{"$_="} = $e->{server}{$_} foreach qw(username password);
fs::mount_options::pack($part, $options, $unknown);
}
$part;
@@ -40,7 +40,7 @@ sub smbclient {
my $ip = $server->{ip} ? "-I $server->{ip}" : '';
my $group = $server->{group} ? qq( -W "$server->{group}") : '';
- my $U = $server->{username} ? sprintf("%s/%s%%%s", @$server{'domain', 'username', 'password'}) : '%';
+ my $U = $server->{username} ? sprintf("%s/%s%%%s", @$server{'username', 'password'}) : '%';
my %h;
foreach (`smbclient -g -U "$U" -L "$name" $ip$group 2>/dev/null`) {
if (my ($type, $v1, $v2) = /(.*)\|(.*)\|(.*)/) {