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

Author: jsuchome Date: Wed Apr 9 16:05:13 2008 New Revision: 46292 URL: http://svn.opensuse.org/viewcvs/yast?rev=46292&view=rev Log: - enable specifying of the machine account (fate#301320) - 2.16.4 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/SambaAD.pm trunk/samba-client/src/SambaNetJoin.pm 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=46292&r1=46291&r2=46292&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Wed Apr 9 16:05:13 2008 @@ -1 +1 @@ -2.16.3 +2.16.4 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=46292&r1=46291&r2=46292&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Wed Apr 9 16:05:13 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Apr 9 15:27:32 CEST 2008 - jsuchome@suse.cz + +- enable specifying of the machine account (fate#301320) +- 2.16.4 + +------------------------------------------------------------------- +Wed Apr 2 11:28:21 CEST 2008 - jsuchome@suse.cz + +- enable single sign-on for SSH (fate #303415) + +------------------------------------------------------------------- Fri Mar 28 12:52:34 CET 2008 - jsuchome@suse.cz - do not check for required packages during Read (bnc#374703) Modified: trunk/samba-client/src/SambaAD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaAD.pm?rev=46292&r1=46291&r2=46292&view=diff ============================================================================== --- trunk/samba-client/src/SambaAD.pm (original) +++ trunk/samba-client/src/SambaAD.pm Wed Apr 9 16:05:13 2008 @@ -36,6 +36,43 @@ # Kerberos realm for AD my $realm = ""; +# Read the list of available machine accounts in the current domain +# +# @param domain AD domain +# @param user user name +# @param password password +# @return list +BEGIN{$TYPEINFO{GetMachines}= [ + "function", ["list","string"], "string", "string", "string"]} +sub GetMachines { + + my ($self, $domain, $user, $passwd) = @_; + my @ret = (); + + my $tmpdir = SCR->Read (".target.tmpdir"); + my $conf_file = $tmpdir."/smb.conf"; + my $cmd = "net ads search \"(objectclass=organizationalUnit)\" distinguishedName -s $conf_file -U '$user%". ($passwd||"") . "'"; + + SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n"); + + my $result = SCR->Execute(".target.bash_output", $cmd); + + if ($result->{"exit"} eq 0) { + foreach my $line (split (/\n/,$result->{"stdout"} || "")) { + if ($line =~ m/^distinguishedName:/) { + my $dn = $line; + $dn =~ s/^distinguishedName:([\t ]*)//g; + push @ret, $dn if $dn; + } + } + } + else { + $cmd =~ s/(-U '[^%]*)%[^']*'/$1'/; # hide password in the log + y2warning ("$cmd failed: ".Dumper($result)); + return undef; + } + return \@ret; +} # Check if a given workgroup is a Active Directory domain and return the name # of AD domain controler Modified: trunk/samba-client/src/SambaNetJoin.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaNetJoin.pm?rev=46292&r1=46291&r2=46292&view=diff ============================================================================== --- trunk/samba-client/src/SambaNetJoin.pm (original) +++ trunk/samba-client/src/SambaNetJoin.pm Wed Apr 9 16:05:13 2008 @@ -66,11 +66,13 @@ # @param domain a name of a domain to be joined # @param join_level level of a domain membership when joining ("member", "bdc" or "pdc") # @param user username to be used for joining, or nil for anonymous -# @param passwd password for the user +# @param passwd password for the user +# @param machine machine account to join into (fate 301320) # @return string an error message or nil if successful -BEGIN{$TYPEINFO{Join}=["function","string","string","string","string","string"]} +BEGIN{$TYPEINFO{Join}=[ + "function","string","string","string","string","string","string"]} sub Join { - my ($self, $domain, $join_level, $user, $passwd) = @_; + my ($self, $domain, $join_level, $user, $passwd, $machine) = @_; my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef); my $server = SambaAD->ADS (); @@ -97,6 +99,8 @@ . (($protocol ne "ads" && $netbios_name)?" -n '$netbios_name'":"") . " -U '" . ($user||"") . "%" . ($passwd||"") . "'"; + $cmd = $cmd. " -createcomputer=\"$machine\"" if $machine; + my $result = SCR->Execute(".target.bash_output", $cmd); $cmd =~ s/(-U '[^%]*)%[^']*'/$1'/; # hide password in debug y2internal("$cmd => ".Dumper($result)); Modified: trunk/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/routines.ycp?rev=46292&r1=46291&r2=46292&view=diff ============================================================================== --- trunk/samba-client/src/routines.ycp (original) +++ trunk/samba-client/src/routines.ycp Wed Apr 9 16:05:13 2008 @@ -30,34 +30,92 @@ * Allow user to type in a user/password pair in a popup. * * @param message a text to be displayed above the password text entry - * @param defaultuser a pre-filled user name + * @param defaultuser a pre-filled user name * @return map $["user": string, "password": string] with information * provided by the user or nil on cancel */ -define map passwordUserPopup( string message, string defaultuser ) ``{ - UI::OpenDialog( - `VBox( - `Label( message ), - // text entry label - `TextEntry(`id(`user), _("&Username"), defaultuser ), - // text entry label - `Password(`id(`passwd), _("&Password") ), - `HBox( - `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), - `PushButton(`id(`cancel), Label::CancelButton() ) +map passwordUserPopup( string message, string defaultuser, string domain) +{ + term machine_term = `Empty (); + // default value of Machine Account + string default_entry= _("(default)"); + if (SambaAD::ADS () != "") + { + list machines = [ default_entry ]; + machine_term = `HBox ( + `ReplacePoint (`id (`rpcombo), + `Left (`ComboBox (`id (`machines), `opt (`hstretch), + // combo box label + _("&Machine Account"), machines) ) - ) - ); - - any ret = UI::UserInput(); - - map result = ret == `ok ? $[ - "user":(string)UI::QueryWidget(`id(`user), `Value), - "password":(string)UI::QueryWidget(`id(`passwd), `Value) ] - : nil; + ), + `VBox ( + `Label (""), + `PushButton (`id (`acquire), _("&Acquire")) + ) + ); + } + UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing (0.7), `VBox ( + `HSpacing (25), + `VSpacing (0.2), + `Left (`Label (message)), + // text entry label + `InputField (`id (`user), `opt (`hstretch), _("&Username"),defaultuser), + `Password (`id(`passwd), `opt (`hstretch), Label::Password()), + machine_term, + `VSpacing (0.2), + `HBox ( + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) + ), + `VSpacing (0.2) + ), `HSpacing (0.7))); + + if (SambaAD::ADS () != "") + { + UI::ChangeWidget (`id (`machines), `Enabled, false); + } + any ret = nil; + string user = ""; + string pass = ""; + while (true) + { + ret = UI::UserInput(); + user = (string)UI::QueryWidget(`id(`user), `Value); + pass = (string)UI::QueryWidget(`id(`passwd), `Value); + + if (ret == `ok || ret == `cancel) + break; + if (ret == `acquire) + { + if (user == "" || pass == "") + { + // error popup + Popup::Error (_("User name and password are required +for listing the machine accounts.")); + continue; + } + list machines = SambaAD::GetMachines (domain, user, pass); + if (machines != nil) + { + machines = prepend (machines, default_entry); + UI::ReplaceWidget (`id (`rpcombo), `Left ( + `ComboBox (`id (`machines), `opt (`hstretch), + _("&Machine Account"), machines) + )); + UI::ChangeWidget (`id (`machines), `Enabled, true); + } + } + } + map result = (ret == `ok) ? $[ + "user" : user, + "password" : pass + ] : nil; + if (SambaAD::ADS () != "" && ret == `ok) + result["machine"]= (string)UI::QueryWidget (`id (`machines), `Value); UI::CloseDialog(); - + return result; } @@ -110,21 +168,22 @@ define symbol JoinDomain(string workgroup) { - // translators: popup to fill in the domain joining info; %1 is the domain name - map passwd = passwordUserPopup(sformat(_("Enter the username and the password\nfor joining the domain %1."), workgroup) - + "\n\n" - + _("To join the domain anonymously, leave the\ntext entries empty.") + "\n", "Administrator"); + // 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); // cancelled the domain joining if( passwd == nil ) return `fail; - // try to join the domain - string error = SambaNetJoin::Join(workgroup, "member", passwd["user"]:nil, passwd["password"]:"" ); + string error = SambaNetJoin::Join ( + workgroup, "member", + passwd["user"]:nil, passwd["password"]:"", passwd["machine"]:nil); + if (error != nil) { Popup::Error(error); return `fail; } - // Translators: Information popup, %1 is the name of the domain Popup::Message(sformat(_("Domain %1 joined successfully."), Samba::GetWorkgroup())); return `ok; Modified: trunk/samba-client/src/samba-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/samba-client.ycp?rev=46292&r1=46291&r2=46292&view=diff ============================================================================== --- trunk/samba-client/src/samba-client.ycp (original) +++ trunk/samba-client/src/samba-client.ycp Wed Apr 9 16:05:13 2008 @@ -106,7 +106,7 @@ SambaAD::ReadRealm (); } - string result = SambaNetJoin::Join(domain, "member", (string)(options["user"]:nil), (string) (options["password"]:"")); + string result = SambaNetJoin::Join(domain, "member", (string)(options["user"]:nil), (string) (options["password"]:""), (string) (options["machine"]:nil)); if( result == nil ) { // translators: result message for joindomain command line action CommandLine::Print( sformat( _("Domain %1 joined successfully."), domain ) ); @@ -202,6 +202,11 @@ "help" : _("The password used for the user when joining the domain"), "type" : "string" ], + "machine" :$[ + // command line help text for machine optioa + "help" : _("The machine account"), + "type" : "string" + ], "workgroup" :$[ // translators: command line help text for the workgroup name option "help" : _("The name of a workgroup"), @@ -211,7 +216,7 @@ "mappings" : $[ "winbind" : [ "enable", "disable" ], "isdomainmember": [ "domain" ], - "joindomain" : [ "domain", "user", "password" ], + "joindomain" : [ "domain", "user", "password", "machine" ], "configure" : [ "workgroup" ] ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org