[yast-commit] r46403 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/SambaNetJoin.pm src/dialogs.ycp src/routines.ycp src/samba-client.ycp

Author: jsuchome Date: Fri Apr 11 14:19:56 2008 New Revision: 46403 URL: http://svn.opensuse.org/viewcvs/yast?rev=46403&view=rev Log: - added button for leaving AD domain (fate#300458) - 2.16.5 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/SambaNetJoin.pm trunk/samba-client/src/dialogs.ycp trunk/samba-client/src/routines.ycp trunk/samba-client/src/samba-client.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=46403&r1=46402&r2=46403&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Fri Apr 11 14:19:56 2008 @@ -1 +1 @@ -2.16.4 +2.16.5 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=46403&r1=46402&r2=46403&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Fri Apr 11 14:19:56 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 11 14:01:43 CEST 2008 - jsuchome@suse.cz + +- added button for leaving AD domain (fate#300458) +- 2.16.5 + +------------------------------------------------------------------- Wed Apr 9 15:27:32 CEST 2008 - jsuchome@suse.cz - enable specifying of the machine account (fate#301320) Modified: trunk/samba-client/src/SambaNetJoin.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaNetJoin.pm?rev=46403&r1=46402&r2=46403&view=diff ============================================================================== --- trunk/samba-client/src/SambaNetJoin.pm (original) +++ trunk/samba-client/src/SambaNetJoin.pm Fri Apr 11 14:19:56 2008 @@ -117,4 +117,46 @@ return ($result && $error ne "") ? $error : "unknown error"; } +# Joins the host into a given domain. If user is provided, it will use +# the user and password for joining. If the user is nil, joining will +# be done anonymously. +# +# Attention: It will write the configuration for domain before settings the password +# +# @param domain a name of a domain to be left +# @param user username to be used for joining, or nil for anonymous +# @param passwd password for the user +# @return string an error message or nil if successful +BEGIN{$TYPEINFO{Leave}= [ "function","string","string","string","string"]} +sub Leave { + + my ($self, $domain, $user, $passwd) = @_; + + my $tmpdir = SCR->Read (".target.tmpdir"); + my $conf_file = $tmpdir."/smb.conf"; + my $realm = SambaAD->Realm (); + + 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||"") . "'"; + + my $result = SCR->Execute(".target.bash_output", $cmd); + $cmd =~ s/(-U '[^%]*)%[^']*'/$1'/; # hide password in the log + y2internal("$cmd => ".Dumper($result)); + + # check the exit code, return nil on success + if ($result && defined $result->{exit} && $result->{exit} == 0) { + # force new testjoin run (maybe domain from first testjoin was replaced + # by realm => empty whole hash) + %TestJoinCache = (); + return undef; + } + + # otherwise return stderr + my $error = $result->{stdout} ne "" ? $result->{stdout} : $result->{stderr}; + return ($result && $error ne "") ? $error : "unknown error"; +} + + 8; Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=46403&r1=46402&r2=46403&view=diff ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Fri Apr 11 14:19:56 2008 @@ -156,10 +156,18 @@ } Popup::ClearFeedback (); + term leave_button = (SambaAD::ADS () == "") ? `Empty () : + // push button label + `PushButton (`id (`leave), _("&Leave")); UI::ReplaceWidget (`id(`rpstatus), (Stage::cont () || CheckWorkgroup (domain) != `joined_domain) ? - // status label - `Empty() : `Left (`Label (_("Currently a member of this domain"))) + `Empty() : + `HBox ( + // status label + `Left (`Label (_("Currently a member of this domain"))), + `HStretch (), + leave_button + ) ); } @@ -214,7 +222,8 @@ `VBox ( `HBox( `HSpacing (0.2), - `InputField (`id(`workgroup), `opt (`hstretch), +// `InputField (`id(`workgroup), `opt (`hstretch), + `TextEntry (`id(`workgroup), `opt (`hstretch), (Stage::cont() ? _("&Domain") : // translators: text entry label @@ -286,6 +295,15 @@ if(ReallyAbort()) break; else continue; } + else if (ret == `leave) + { + string workgroup = (string)UI::QueryWidget(`id(`workgroup), `Value); + if (LeaveDomain (workgroup) == `ok) + { + check_domain_membership (workgroup); + UI::ChangeWidget(`id(`winbind), `Value, false); + } + } else if (ret == `winbind) { UI::ChangeWidget (`id(`mkhomedir), `Enabled, use_winbind); UI::ChangeWidget (`id(`caching), `Enabled, use_winbind); Modified: trunk/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/routines.ycp?rev=46403&r1=46402&r2=46403&view=diff ============================================================================== --- trunk/samba-client/src/routines.ycp (original) +++ trunk/samba-client/src/routines.ycp Fri Apr 11 14:19:56 2008 @@ -34,12 +34,12 @@ * @return map $["user": string, "password": string] with information * provided by the user or nil on cancel */ -map passwordUserPopup( string message, string defaultuser, string domain) +map passwordUserPopup (string message, string defaultuser, string domain, symbol what) { term machine_term = `Empty (); // default value of Machine Account string default_entry= _("(default)"); - if (SambaAD::ADS () != "") + if (SambaAD::ADS () != "" && what != `leave) { list machines = [ default_entry ]; machine_term = `HBox ( @@ -75,6 +75,7 @@ { UI::ChangeWidget (`id (`machines), `Enabled, false); } + UI::SetFocus (`id (`passwd)); any ret = nil; string user = ""; string pass = ""; @@ -165,13 +166,35 @@ return ret; } +/** + * Leave an AD domain + */ +define symbol LeaveDomain (string workgroup) +{ + // popup to fill in the domain leaving info; %1 is the domain name + map passwd = passwordUserPopup (sformat(_("Enter the username and the password for leaving the domain %1."), workgroup), + "Administrator", workgroup, `leave); + + // cancelled the domain leaving + if( passwd == nil ) return `fail; + // try to join the domain + string error = SambaNetJoin::Leave ( + workgroup, passwd["user"]:nil, passwd["password"]:"" + ); + + if (error != nil) { + Popup::Error(error); + return `fail; + } + return `ok; +} define symbol JoinDomain(string workgroup) { // popup to fill in the domain joining info; %1 is the domain name map passwd = passwordUserPopup(sformat(_("Enter the username and the password for joining the domain %1."), workgroup) + "\n\n" - + _("To join the domain anonymously, leave the text entries empty.") + "\n", "Administrator", workgroup); + + _("To join the domain anonymously, leave the text entries empty.") + "\n", "Administrator", workgroup, `join); // cancelled the domain joining if( passwd == nil ) return `fail; Modified: trunk/samba-client/src/samba-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/samba-client.ycp?rev=46403&r1=46402&r2=46403&view=diff ============================================================================== --- trunk/samba-client/src/samba-client.ycp (original) +++ trunk/samba-client/src/samba-client.ycp Fri Apr 11 14:19:56 2008 @@ -20,7 +20,6 @@ import "CommandLine"; import "Popup"; import "Report"; -import "Package"; import "Samba"; import "SambaAD"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org