В сообщении от Monday 14 October 2019 10:29:07 Slávek Banko написал(а): > On Monday 14 of October 2019 05:03:56 Andrew Randrianasulu wrote: > > В сообщении от Sunday 13 October 2019 14:00:57 Michele Calgaro via > trinity-devel написал(а): > > > On 2019/10/08 10:44 AM, Andrew Randrianasulu wrote: > > > > Hello! > > > > > > > > I was trying to build my own KDE3-based LiveCD (based on Slackware > > > > 14.1!). While most things worked - samba configuration using KDE's > > > > own config module from kcontrol showed mostly greyed-out fields. > > > > > > > > Aw .... > > > > > > > > I looked at > > > > http://mirror.git.trinitydesktop.org/cgit/tdenetwork/tree/filesharin > > > >g/advanced/kcm_sambaconf/sambafile.cpp > > > > > > > > and tadam! > > > > > > Thanks Andrew, good work. > > > Can you upload your work in pull rquest form on TGW? That way your > > > work won't get lost within many other things... See here for a giude > > > on how to do that. > > > https://wiki.trinitydesktop.org/TDE_Gitea_Workspace > > > > Not quite pull request, only issue: > > > > https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/issues/15 > > > > {I still use kde 3.5.10, building 'real' TDE will require some more > > effort from my side. After I finally will be pushed to move to 64-bit > > OS, I think .... quite soon, looking at trends} > > > > > Cheers and keep up the good work! > > > Michele > > > > > :} thanks. > > : > > Hi Andrew, > > now, as a member of the Contributors team, you can even create a > pull-request. Don't forget to mention something like "This resolves issue > #15" in the git commit message. > > Cheers Made patch with 'git format-patch'. (removed few whitespaces in the process) Can anyone check if it compiles and works in context of TDE, as opposed to KDE3?
From 50620f504cd840ce88727f05b6ed5afb50ae7096 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <randrianasulu@xxxxxxxxx> Date: Mon, 14 Oct 2019 13:49:28 +0300 Subject: [PATCH] Adding checking for Samba version 4 in filesharing/advanced/kcm_sambaconf/sambafile.cpp Fixes https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/issues/15 --- filesharing/advanced/kcm_sambaconf/sambafile.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 7929b96d..211e4b7a 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -356,6 +356,12 @@ int SambaFile::getSambaVersion() { if (_parmOutput.find("3") > -1) _sambaVersion = 3; } + + if (testParam.start(KProcess::Block,KProcess::Stdout)) { + if (_parmOutput.find("4") > -1) + _sambaVersion = 4; + } + kdDebug(5009) << "Samba version = " << _sambaVersion << endl; @@ -373,7 +379,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload) testParam << "testparm"; testParam << "-s"; - if (getSambaVersion() == 3) + if ((getSambaVersion() == 3) || (getSambaVersion() == 4)) testParam << "-v"; -- 2.14.5
--------------------------------------------------------------------- To unsubscribe, e-mail: trinity-devel-unsubscribe@xxxxxxxxxxxxxxxxxxxxxxxxxx For additional commands, e-mail: trinity-devel-help@xxxxxxxxxxxxxxxxxxxxxxxxxx Read list messages on the web archive: http://trinity-devel.pearsoncomputing.net/ Please remember not to top-post: http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
