diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2009-01-15 13:47:51 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2009-01-15 13:47:51 +0000 |
| commit | 2e89cc65ce2e7c9b60d131726941e2f10ab72401 (patch) | |
| tree | 16c983e2fba17de5e1b035e51d4140c2cc95bfeb | |
| parent | 833bc0889606469ba32747d265b7a460b1753d69 (diff) | |
| download | drakx-2e89cc65ce2e7c9b60d131726941e2f10ab72401.tar drakx-2e89cc65ce2e7c9b60d131726941e2f10ab72401.tar.gz drakx-2e89cc65ce2e7c9b60d131726941e2f10ab72401.tar.bz2 drakx-2e89cc65ce2e7c9b60d131726941e2f10ab72401.tar.xz drakx-2e89cc65ce2e7c9b60d131726941e2f10ab72401.zip | |
- diskdrake:
o --smb: fix netbios name resolution (#42483, thanks to Derek Jennings)
(backport from trunk)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fs/remote/smb.pm | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index cf29fd056..d8a866a79 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.71.6 - 9 January 2009 - prevent mdkapplet from crashing (#46477) 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) = /(.*)\|(.*)\|(.*)/) { |