Author: jsuchome Date: Mon Apr 4 14:56:43 2011 New Revision: 63706 URL: http://svn.opensuse.org/viewcvs/yast?rev=63706&view=rev Log: - set the value of 'kerberos method' option for single sign on, add the API for its possible change (bnc#673982) - 2.21.1 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/Samba.ycp trunk/samba-client/src/SambaNetJoin.pm trunk/samba-client/src/dialogs.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=63706&r1=63705&r2=63706&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Mon Apr 4 14:56:43 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 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=63706&r1=63705&r2=63706&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Mon Apr 4 14:56:43 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 4 14:55:00 CEST 2011 - jsuchome@suse.cz + +- set the value of 'kerberos method' option for single sign on, + add the API for its possible change (bnc#673982) +- 2.21.1 + +------------------------------------------------------------------- Wed Mar 23 12:40:12 CET 2011 - jsuchome@suse.cz - aborting in Stage::cont does not abort installation (bnc#678650) Modified: trunk/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=63706&r1=63705&r2=63706&view=diff ============================================================================== --- trunk/samba-client/src/Samba.ycp (original) +++ trunk/samba-client/src/Samba.ycp Mon Apr 4 14:56:43 2011 @@ -132,6 +132,9 @@ // original value of pam_mount_volumes, for detecting changes list<map> pam_mount_volumes_orig = nil; +// value of kerberos_method, if not empty (bnc#673982) +string kerberos_method = "secrets and keytab"; + // network configuration (to be read from NetworkConfig module) global map network_setup = NetworkConfig::Export (); @@ -473,6 +476,7 @@ ssh_was_enabled = (ssh == true); sshd_was_enabled = sshd; ssh_support = ssh_was_enabled && sshd_was_enabled; + kerberos_method = SambaConfig::GlobalGetStr ("kerberos method", kerberos_method); return ssh_support; } @@ -489,6 +493,8 @@ global define boolean SetSSHSupport (boolean enable) { ssh_support = enable; ssh_modified = (enable != (ssh_was_enabled && sshd_was_enabled)); + // bnc#673982 + SambaConfig::GlobalSetStr ("kerberos method", enable? kerberos_method : nil); return enable; } @@ -522,6 +528,26 @@ } /** + * Get the value of kerberos-method option + */ +global define string GetKerberosMethod () { + return kerberos_method; +} + +/** + * Set the new value for kerberos-method option + * return true if the value was changed + */ +global define boolean SetKerberosMethod (string new) { + if (new != kerberos_method) + { + kerberos_method = new; + return true; + } + return false; +} + +/** * Start/Stop and FAM service according to current settings * @param write_only do not start/stop services * @return success Modified: trunk/samba-client/src/SambaNetJoin.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaNetJoin.pm?rev=63706&r1=63705&r2=63706&view=diff ============================================================================== --- trunk/samba-client/src/SambaNetJoin.pm (original) +++ trunk/samba-client/src/SambaNetJoin.pm Mon Apr 4 14:56:43 2011 @@ -91,7 +91,12 @@ if ($protocol eq "ads") { my $krb_file = $tmpdir."/krb5.conf"; my $realm = SambaAD->Realm (); - SCR->Write (".target.string", $conf_file, "[global]$include\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n"); + my $content = "[global]$include\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n"; + my $kerberos_method = SambaConfig->GlobalGetStr ("kerberos method", ""); + if ($kerberos_method) { + $content = $content."\tkerberos method = $kerberos_method\n"; + } + SCR->Write (".target.string", $conf_file, $content); $cmd = "KRB5_CONFIG=$krb_file "; SCR->Write (".target.string", $krb_file, "[realms]\n\t$realm = {\n\tkdc = $server\n\t}\n"); } Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=63706&r1=63705&r2=63706&view=diff ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Mon Apr 4 14:56:43 2011 @@ -569,6 +569,10 @@ // for domain ask to join symbol workgroup_type = CheckWorkgroup(workgroup); + // need to set this before the join + Samba::SetSSHSupport (use_winbind && + (boolean)UI::QueryWidget (`id(`ssh), `Value)); + if (Mode::config()) { foreach (string key, [ "user", "password", "machine" ], { @@ -651,8 +655,6 @@ (boolean)UI::QueryWidget(`id(`mkhomedir), `Value)); Samba::SetWinbindCaching (use_winbind && (boolean)UI::QueryWidget(`id(`caching), `Value)); - Samba::SetSSHSupport (use_winbind && - (boolean)UI::QueryWidget (`id(`ssh), `Value)); boolean new_share = (boolean)UI::QueryWidget(`id(`share_ch),`Value); if (new_share && ! allow_share && SharesExist (Samba::shares_dir)) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org