Author: jsuchome Date: Wed Jun 4 09:02:01 2008 New Revision: 48038 URL: http://svn.opensuse.org/viewcvs/yast?rev=48038&view=rev Log: - correctly quote the 'net join' command (bnc#396070) - 2.16.9 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/SambaNetJoin.pm Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=48038&r1=48037&r2=48038&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Wed Jun 4 09:02:01 2008 @@ -1 +1 @@ -2.16.8 +2.16.9 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba-client.changes?rev=48038&r1=48037&r2=48038&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Wed Jun 4 09:02:01 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 3 16:15:22 CEST 2008 - jsuchome@suse.cz + +- correctly quote the 'net join' command (bnc#396070) +- 2.16.9 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/samba-client/src/SambaNetJoin.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaNetJoin.pm?rev=48038&r1=48037&r2=48038&view=diff ============================================================================== --- trunk/samba-client/src/SambaNetJoin.pm (original) +++ trunk/samba-client/src/SambaNetJoin.pm Wed Jun 4 09:02:01 2008 @@ -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"; @@ -21,6 +21,7 @@ YaST::YCP::Import("SCR"); YaST::YCP::Import("SambaConfig"); YaST::YCP::Import("SambaAD"); +YaST::YCP::Import("String"); my %TestJoinCache; @@ -97,7 +98,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 +145,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 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org