From 65da1f26a806151060d03a2e2ef448b8bc53021f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 15 Jan 2009 14:38:57 +0000
Subject: - diskdrake:   o --smb: fix netbios name resolution (#42483, thanks
 to Derek Jennings)

(domain= should not be set in credentials for mount.cifs)
---
 perl-install/fs/remote/smb.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/fs/remote/smb.pm')

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

e/po/fr.po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>tree</a><a class='active' href='/software/drakpxelinux/commit/po/fr.po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>commit</a><a href='/software/drakpxelinux/diff/po/fr.po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>diff</a><a href='/software/drakpxelinux/stats/po/fr.po?h=V1_2_0_6mdk'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakpxelinux/log/po/fr.po'>
<input type='hidden' name='h' value='V1_2_0_6mdk'/><input type='hidden' name='id' value='f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/software/drakpxelinux/commit/?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>root</a>/<a href='/software/drakpxelinux/commit/po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>po</a>/<a href='/software/drakpxelinux/commit/po/fr.po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>fr.po</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='V1_2_0_6mdk'/><input type='hidden' name='id' value='f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2004-10-06 04:37:54 +0000</td></tr>
<tr><th>committer</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2004-10-06 04:37:54 +0000</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/software/drakpxelinux/commit/po/fr.po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>f6a4b1fe82b8d0eade9dd7712e173c102bd0f042</a> (<a href='/software/drakpxelinux/patch/po/fr.po?id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/software/drakpxelinux/tree/?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>f775d31f5c1663dc06cdab18ea492689ff676ded</a> /<a href='/software/drakpxelinux/tree/po/fr.po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042'>po/fr.po</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/software/drakpxelinux/commit/po/fr.po?h=V1_2_0_6mdk&amp;id=429f4bc946a3f9a1b4b73a695eb349cd407fee2f'>429f4bc946a3f9a1b4b73a695eb349cd407fee2f</a> (<a href='/software/drakpxelinux/diff/po/fr.po?h=V1_2_0_6mdk&amp;id=f6a4b1fe82b8d0eade9dd7712e173c102bd0f042&amp;id2=429f4bc946a3f9a1b4b73a695eb349cd407fee2f'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/software/drakpxelinux/snapshot/drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar'>drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar</a><br/><a href='/software/drakpxelinux/snapshot/drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar.gz'>drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar.gz</a><br/><a href='/software/drakpxelinux/snapshot/drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar.bz2'>drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar.bz2</a><br/><a href='/software/drakpxelinux/snapshot/drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar.xz'>drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.tar.xz</a><br/><a href='/software/drakpxelinux/snapshot/drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.zip'>drakpxelinux-f6a4b1fe82b8d0eade9dd7712e173c102bd0f042.zip</a><br/></td></tr></table>
<div class='commit-subject'>updated po file</div><div class='commit-msg'>