Hello community,
here is the log from the commit of package yast2-samba-client for openSUSE:Factory
checked in at Wed Apr 6 11:34:31 CEST 2011.
--------
--- yast2-samba-client/yast2-samba-client.changes 2011-04-04 14:57:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-samba-client/yast2-samba-client.changes 2011-04-06 11:00:39.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 6 10:56:08 CEST 2011 - jsuchome@suse.cz
+
+- UI option to set kerberos method (bnc#673982)
+- 2.21.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-samba-client-2.21.1.tar.bz2
New:
----
yast2-samba-client-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.CEAFLi/_old 2011-04-06 11:33:19.000000000 +0200
+++ /var/tmp/diff_new_pack.CEAFLi/_new 2011-04-06 11:33:19.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-samba-client
-Version: 2.21.1
+Version: 2.21.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.21.1.tar.bz2
+Source0: yast2-samba-client-2.21.2.tar.bz2
Prefix: /usr
@@ -47,7 +47,7 @@
workgroup/domain and authentication against an SMB domain.
%prep
-%setup -n yast2-samba-client-2.21.1
+%setup -n yast2-samba-client-2.21.2
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-samba-client-2.21.1.tar.bz2 -> yast2-samba-client-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.21.1/VERSION new/yast2-samba-client-2.21.2/VERSION
--- old/yast2-samba-client-2.21.1/VERSION 2011-04-04 14:55:25.000000000 +0200
+++ new/yast2-samba-client-2.21.2/VERSION 2011-04-06 10:56:28.000000000 +0200
@@ -1 +1 @@
-2.21.1
+2.21.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.21.1/src/Samba.ycp new/yast2-samba-client-2.21.2/src/Samba.ycp
--- old/yast2-samba-client-2.21.1/src/Samba.ycp 2011-04-04 14:56:44.000000000 +0200
+++ new/yast2-samba-client-2.21.2/src/Samba.ycp 2011-04-06 10:56:45.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 63706 2011-04-04 12:56:43Z jsuchome $
+ * $Id: Samba.ycp 63728 2011-04-06 08:56:44Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
@@ -132,9 +132,6 @@
// 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 ();
@@ -476,7 +473,6 @@
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;
}
@@ -493,8 +489,13 @@
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);
+ string kerberos_method = SambaConfig::GlobalGetStr ("kerberos method", "");
+ // bnc#673982, use "secrets and keytab" as default (=when not set otherwise)
+ if (ssh_support && kerberos_method == "")
+ {
+ kerberos_method = "secrets and keytab";
+ SambaConfig::GlobalSetStr ("kerberos method", kerberos_method);
+ }
return enable;
}
@@ -528,26 +529,6 @@
}
/**
- * 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.1/src/dialogs.ycp new/yast2-samba-client-2.21.2/src/dialogs.ycp
--- old/yast2-samba-client-2.21.1/src/dialogs.ycp 2011-04-04 14:56:44.000000000 +0200
+++ new/yast2-samba-client-2.21.2/src/dialogs.ycp 2011-04-06 10:56:45.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 63706 2011-04-04 12:56:43Z jsuchome $
+ * $Id: dialogs.ycp 63728 2011-04-06 08:56:44Z jsuchome $
*/
{
@@ -132,12 +132,14 @@
integer gid_max = tointeger (l[1]:"20000");
if (gid_max == nil) gid_max = 20000;
boolean dhcp_support = Samba::GetDHCP ();
+ string kerberos_method = SambaConfig::GlobalGetStr ("kerberos method", "");
// help text, do not translate 'winbind uid', 'winbind gid'
string help_text = _("<p>Specify the <b>Range</b> for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).</p>")
+ HostsResolutionHelp ()
+ DHCPSupportHelp ()
+ + KerberosMethodHelp ()
+ PAMMountHelp ();
boolean hosts_resolution = Samba::GetHostsResolution ();
@@ -170,6 +172,10 @@
});
return mount_items;
}
+ list<term> kerberos_methods = maplist (string method,
+ [ "secrets only", "system keytab", "dedicated keytab", "secrets and keytab"], {
+ return `item (`id (method), method, method == kerberos_method);
+ });
term contents = `HBox (`HSpacing (3), `VBox (
`VSpacing (0.4),
@@ -188,7 +194,10 @@
// int field label
`IntField (`id (`gid_max), _("M&aximum"), 0, 99999, gid_max)
)),
- `VSpacing (),
+ `VSpacing (0.2),
+ // combobox label
+ `Left (`ComboBox (`id (`kerberos_method), _("&Kerberos Method"), kerberos_methods)),
+ `VSpacing (0.2),
// frame label
`Frame (_("Windows Internet Name Service"), `VBox (
HostsResolutionTerm (hosts_resolution),
@@ -286,6 +295,9 @@
Samba::SetHostsResolution (
(boolean)UI::QueryWidget (`id (`hosts_resolution), `Value));
+ kerberos_method = (string) UI::QueryWidget (`id (`kerberos_method), `Value);
+ SambaConfig::GlobalSetStr ("kerberos method", kerberos_method == "secrets only" ? nil : kerberos_method);
+
list<map> updated_volumes = non_cifs_volumes;
foreach (integer id, map volume, mount_map, {
updated_volumes = add (updated_volumes, volume);
@@ -438,7 +450,7 @@
),
`Left (
// checkbox label
- `CheckBox (`id(`ssh),_("&Single Sign-On for SSH"),
+ `CheckBox (`id(`ssh), `opt (`notify), _("&Single Sign-On for SSH"),
Samba::GetSSHSupport ())
),
`VSpacing (0.2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.21.1/src/routines.ycp new/yast2-samba-client-2.21.2/src/routines.ycp
--- old/yast2-samba-client-2.21.1/src/routines.ycp 2011-03-23 15:00:09.000000000 +0100
+++ new/yast2-samba-client-2.21.2/src/routines.ycp 2011-04-06 10:56:45.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of samba-client.
* Authors: Stanislav Visnovsky
*
- * $Id: routines.ycp 63652 2011-03-23 14:00:08Z jsuchome $
+ * $Id: routines.ycp 63728 2011-04-06 08:56:44Z jsuchome $
*/
{
@@ -428,5 +428,11 @@
_("<p>For example, you may use <tt>/home/%(DOMAIN_USER)</tt> value for <b>Remote Path</b>, <tt>~/</tt> value for <b>Local Mount Point</b> to mount the home directory, together with a value <tt>user=%(DOMAIN_USER)</tt> as a part of <b>Options</b>.</p>");
}
+// return help for Kerberos Method
+string KerberosMethodHelp () {
+ // help text for kerberos method option
+ return _("<p>The value of <b>Kerberos Method</b> sets how kerberos tickets are verified. When <b>Single Sing-on for SSH</b> is used, the default Kerberos Method set by YaST is <tt>secrets and keytab</tt>. See smb.conf manual page for details.</p>");
+}
+
/* EOF */
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org