From 6d50d256c2e5db942ff5e7cac1479777bd6ab01f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 15 Jan 2009 14:39:46 +0000 Subject: - 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) --- perl-install/fs/remote/smb.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/fs/remote') 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)); } -- cgit v1.2.1