Hello community,
here is the log from the commit of package yast2-samba-client for openSUSE:Factory
checked in at Tue Apr 5 18:21:05 CEST 2011.
--------
--- yast2-samba-client/yast2-samba-client.changes 2011-03-23 15:05:03.000000000 +0100
+++ yast2-samba-client/yast2-samba-client.changes 2011-04-04 14:57:03.000000000 +0200
@@ -1,0 +2,7 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-samba-client-2.21.0.tar.bz2
New:
----
yast2-samba-client-2.21.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.BswVAw/_old 2011-04-05 18:20:39.000000000 +0200
+++ /var/tmp/diff_new_pack.BswVAw/_new 2011-04-05 18:20:39.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-samba-client
-Version: 2.21.0
+Version: 2.21.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.21.0.tar.bz2
+Source0: yast2-samba-client-2.21.1.tar.bz2
Prefix: /usr
@@ -47,7 +47,7 @@
workgroup/domain and authentication against an SMB domain.
%prep
-%setup -n yast2-samba-client-2.21.0
+%setup -n yast2-samba-client-2.21.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-samba-client-2.21.0.tar.bz2 -> yast2-samba-client-2.21.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.21.0/VERSION new/yast2-samba-client-2.21.1/VERSION
--- old/yast2-samba-client-2.21.0/VERSION 2011-03-23 12:40:31.000000000 +0100
+++ new/yast2-samba-client-2.21.1/VERSION 2011-04-04 14:55:25.000000000 +0200
@@ -1 +1 @@
-2.21.0
+2.21.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.21.0/src/Samba.ycp new/yast2-samba-client-2.21.1/src/Samba.ycp
--- old/yast2-samba-client-2.21.0/src/Samba.ycp 2011-01-10 12:25:35.000000000 +0100
+++ new/yast2-samba-client-2.21.1/src/Samba.ycp 2011-04-04 14:56:44.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 63096 2011-01-05 15:15:19Z jsuchome $
+ * $Id: Samba.ycp 63706 2011-04-04 12:56:43Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
@@ -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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.21.0/src/SambaNetJoin.pm new/yast2-samba-client-2.21.1/src/SambaNetJoin.pm
--- old/yast2-samba-client-2.21.0/src/SambaNetJoin.pm 2009-08-21 12:02:55.000000000 +0200
+++ new/yast2-samba-client-2.21.1/src/SambaNetJoin.pm 2011-04-04 14:56:44.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar
#
-# $Id: SambaNetJoin.pm 58415 2009-08-21 10:02:44Z jsuchome $
+# $Id: SambaNetJoin.pm 63706 2011-04-04 12:56:43Z jsuchome $
#
package SambaNetJoin;
@@ -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");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.21.0/src/dialogs.ycp new/yast2-samba-client-2.21.1/src/dialogs.ycp
--- old/yast2-samba-client-2.21.0/src/dialogs.ycp 2010-09-22 15:48:59.000000000 +0200
+++ new/yast2-samba-client-2.21.1/src/dialogs.ycp 2011-04-04 14:56:44.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 62499 2010-09-22 13:48:57Z jsuchome $
+ * $Id: dialogs.ycp 63706 2011-04-04 12:56:43Z jsuchome $
*/
{
@@ -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))
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org