Attachment 219497 Details for Bug 396070

[patch] patch for /usr/share/YaST2/modules/SambaNetJoin.pm

SambaNetJoin.diff (text/plain), 1.10 KB, created by Jiří Suchomel on 2008-06-02 12:37:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2008-06-02 12:37:49 UTC

Size: 1.10 KB

patch

obsolete

>Index: SambaNetJoin.pm
>===================================================================
>--- SambaNetJoin.pm	(revision 47068)
>+++ SambaNetJoin.pm	(working copy)
>@@ -12,7 +12,7 @@
> use strict;
> use Data::Dumper;
> 
>-use YaST::YCP qw(:DATA :LOGGING);
>+use YaST::YCP qw(:LOGGING);
> use YaPI;
> 
> textdomain "samba-client";
>@@ -97,7 +97,7 @@
> 	. ($protocol ne "ads" ? " -w '$domain'" : "")
> 	. " -s $conf_file"
> 	. (($protocol ne "ads" && $netbios_name)?" -n '$netbios_name'":"")
>-	. " -U '" . ($user||"") . "%" . ($passwd||"") . "'";
>+	. " -U '" . String->Quote ($user) . "%" . String->Quote ($passwd) . "'";
> 
>     if ($machine) {
> 	$machine	=~ s/dc=([^,]*)//gi; # remove DC=* parts
>@@ -144,7 +144,7 @@
>     SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
> 
>     my $cmd = "net ads leave -s $conf_file"
>-	. " -U '" . ($user||"") . "%" . ($passwd||"") . "'";
>+	. " -U '" . String->Quote ($user) . "%" . String->Quote ($passwd) . "'";
> 
>     my $result = SCR->Execute(".target.bash_output", $cmd);
>     $cmd =~ s/(-U '[^%]*)%[^']*'/$1'/; # hide password in the log

Actions: View | Diff

Attachments on bug 396070: 219497 | 219501