Mailinglist Archive: yast-commit (711 mails)

< Previous Next >
[yast-commit] r48039 - in /branches/SuSE-Linux-11_0-Branch/samba-client: VERSION package/yast2-samba-client.changes src/SambaNetJoin.pm
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Wed, 04 Jun 2008 07:02:11 -0000
  • Message-id: <20080604070211.CE7C234F70@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Wed Jun 4 09:02:11 2008
New Revision: 48039

URL: http://svn.opensuse.org/viewcvs/yast?rev=48039&view=rev
Log:
- correctly quote the 'net join' command (bnc#396070)
- 2.16.9


Modified:
branches/SuSE-Linux-11_0-Branch/samba-client/VERSION

branches/SuSE-Linux-11_0-Branch/samba-client/package/yast2-samba-client.changes
branches/SuSE-Linux-11_0-Branch/samba-client/src/SambaNetJoin.pm

Modified: branches/SuSE-Linux-11_0-Branch/samba-client/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/samba-client/VERSION?rev=48039&r1=48038&r2=48039&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/samba-client/VERSION (original)
+++ branches/SuSE-Linux-11_0-Branch/samba-client/VERSION Wed Jun 4 09:02:11
2008
@@ -1 +1 @@
-2.16.8
+2.16.9

Modified:
branches/SuSE-Linux-11_0-Branch/samba-client/package/yast2-samba-client.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/samba-client/package/yast2-samba-client.changes?rev=48039&r1=48038&r2=48039&view=diff
==============================================================================
---
branches/SuSE-Linux-11_0-Branch/samba-client/package/yast2-samba-client.changes
(original)
+++
branches/SuSE-Linux-11_0-Branch/samba-client/package/yast2-samba-client.changes
Wed Jun 4 09:02:11 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jun 3 16:15:22 CEST 2008 - jsuchome@xxxxxxx
+
+- correctly quote the 'net join' command (bnc#396070)
+- 2.16.9
+
+-------------------------------------------------------------------
Fri May 16 16:40:22 CEST 2008 - jsrain@xxxxxxx

- added categories Settings and System into desktop file

Modified: branches/SuSE-Linux-11_0-Branch/samba-client/src/SambaNetJoin.pm
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/samba-client/src/SambaNetJoin.pm?rev=48039&r1=48038&r2=48039&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/samba-client/src/SambaNetJoin.pm (original)
+++ branches/SuSE-Linux-11_0-Branch/samba-client/src/SambaNetJoin.pm Wed Jun 4
09:02:11 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@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages