summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2009-01-15 14:37:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2009-01-15 14:37:26 +0000
commitdcb1d46085bfd040855ad5d77b9594494ddff808 (patch)
tree712a3c0542cc7aaa9b4fac3966aed24fbba5ffc3
parent2e89cc65ce2e7c9b60d131726941e2f10ab72401 (diff)
downloaddrakx-dcb1d46085bfd040855ad5d77b9594494ddff808.tar
drakx-dcb1d46085bfd040855ad5d77b9594494ddff808.tar.gz
drakx-dcb1d46085bfd040855ad5d77b9594494ddff808.tar.bz2
drakx-dcb1d46085bfd040855ad5d77b9594494ddff808.tar.xz
drakx-dcb1d46085bfd040855ad5d77b9594494ddff808.zip
revert previous commit (it's all wrong)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/remote/smb.pm4
2 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d8a866a79..cf29fd056 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,3 @@
-- 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 a1b603cf0..378aa6a1e 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);
+ $options->{"$_="} = $e->{server}{$_} foreach qw(username password domain);
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{'username', 'password'}) : '%';
+ my $U = $server->{username} ? sprintf("%s/%s%%%s", @$server{'domain', 'username', 'password'}) : '%';
my %h;
foreach (`smbclient -g -U "$U" -L "$name" $ip$group 2>/dev/null`) {
if (my ($type, $v1, $v2) = /(.*)\|(.*)\|(.*)/) {