diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2009-01-15 14:39:46 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2009-01-15 14:39:46 +0000 |
| commit | 6d50d256c2e5db942ff5e7cac1479777bd6ab01f (patch) | |
| tree | db182f5a62c04a2cf54d9de2f6bd3d0573c09f59 | |
| parent | dcb1d46085bfd040855ad5d77b9594494ddff808 (diff) | |
| download | drakx-backup-do-not-use-6d50d256c2e5db942ff5e7cac1479777bd6ab01f.tar drakx-backup-do-not-use-6d50d256c2e5db942ff5e7cac1479777bd6ab01f.tar.gz drakx-backup-do-not-use-6d50d256c2e5db942ff5e7cac1479777bd6ab01f.tar.bz2 drakx-backup-do-not-use-6d50d256c2e5db942ff5e7cac1479777bd6ab01f.tar.xz drakx-backup-do-not-use-6d50d256c2e5db942ff5e7cac1479777bd6ab01f.zip | |
- diskdrake:
o --smb: fix netbios name resolution (#42483, thanks to Derek Jennings)
(domain= should not be set in credentials for mount.cifs)
(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..84a58318a 100644 --- a/perl-install/fs/remote/smb.pm +++ b/perl-install/fs/remote/smb.pm @@ -124,7 +124,7 @@ sub fstab_entry_to_credentials { my ($options, $unknown) = fs::mount_options::unpack($part); $options->{'username='} && $options->{'password='} or return; - my %h = map { $_ => delete $options->{"$_="} } qw(username domain password); + my %h = map { $_ => delete $options->{"$_="} } qw(username password); $h{file} = $options->{'credentials='} = to_credentials($server_name, $h{username}); fs::mount_options::pack_($part, $options, $unknown), \%h; } @@ -137,7 +137,7 @@ sub remove_bad_credentials { sub save_credentials { my ($credentials) = @_; my $file = $credentials->{file}; - output_with_perm("$::prefix$file", 0640, map { "$_=$credentials->{$_}\n" } qw(username domain password)); + output_with_perm("$::prefix$file", 0640, map { "$_=$credentials->{$_}\n" } qw(username password)); } |